Merge to Fedora kernel-2.6.7-1.494 and VServer 1.9.1.12. Fix some previous merge...

[linux-2.6.git] / arch / ppc / kernel / head_44x.S

diff --git a/arch/ppc/kernel/head_44x.S b/arch/ppc/kernel/head_44x.S
index f38298c..6c7a984 100644 (file)
--- a/arch/ppc/kernel/head_44x.S
+++ b/arch/ppc/kernel/head_44x.S
@@ -177,11 +177,11 @@ skpinv:   addi    r4,r4,1                         /* Increment */
        rfi
 
        /* If necessary, invalidate original entry we used */
-3:     cmpwi   r23,62
+3:     cmpwi   r23,63
        beq     4f
        li      r6,0
        tlbwe   r6,r23,PPC44x_TLB_PAGEID
-       sync
+       isync
 
 4:
 #ifdef CONFIG_SERIAL_TEXT_DEBUG
@@ -680,7 +680,7 @@ interrupt_base:
        mfspr   r4,SPRN_ESR             /* Grab the ESR and save it */
        stw     r4,_ESR(r11)
        addi    r3,r1,STACK_FRAME_OVERHEAD
-       EXC_XFER_EE(0x700, ProgramCheckException)
+       EXC_XFER_STD(0x700, ProgramCheckException)
 
        /* Floating Point Unavailable Interrupt */
        EXCEPTION(0x2010, FloatingPointUnavailable, UnknownException, EXC_XFER_EE)