Dan Malek wrote:

> I was just reminded of a patch to correct a mistake I made in this
> particular kernel.  It is attached.  Apply just this one to the
> MontaVista kernel :-).

Nope, not that one......try this one, sorry.  Too many windows open
and didn't see the build error......



        -- Dan
-------------- next part --------------
diff -Nru linux-2.2.13.orig/arch/ppc/kernel/head.S 
linux-2.2.13/arch/ppc/kernel/head.S
--- linux-2.2.13.orig/arch/ppc/kernel/head.S    Fri Mar 24 23:43:32 2000
+++ linux-2.2.13/arch/ppc/kernel/head.S Fri Mar 24 23:51:19 2000
@@ -2452,11 +2452,11 @@
        SYNC                    /* Some chip revs need this... */
        mtmsr   r6
        SYNC
-       lis     r7, cmd_line at h
-       ori     r7, r7, cmd_line at l
+       lis     r7, cpu6_bug at h
+       ori     r7, r7, cpu6_bug at l
        li      r4, 0x2c00
-       stw     r4, 12(r7)
-       lwz     r4, 12(r7)
+       stw     r4, 0(r7)
+       lwz     r4, 0(r7)
         mtspr   22, r3         /* Update Decrementer */
        SYNC
        mtmsr   r5
@@ -2899,6 +2899,10 @@
        .globl  cmd_line
 cmd_line:
        .space  512
+
+#ifdef CONFIG_8xx_CPU6
+cpu6_bug:
+       .space  4
+#endif

 /*
  * An undocumented "feature" of 604e requires that the v bit

Reply via email to