Merge branch 'master'

[sfrench/cifs-2.6.git] / arch / powerpc / kernel / entry_32.S

diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index 4827ca1ec89b74dfc782b47d921e30172a76200a..b3a9794672250c4ba98c3710e4bef8b691a6a82e 100644 (file)
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -135,10 +135,10 @@ transfer_to_handler:
        mfspr   r11,SPRN_HID0
        mtcr    r11
 BEGIN_FTR_SECTION
-       bt-     8,power_save_6xx_restore        /* Check DOZE */
+       bt-     8,4f                    /* Check DOZE */
 END_FTR_SECTION_IFSET(CPU_FTR_CAN_DOZE)
 BEGIN_FTR_SECTION
-       bt-     9,power_save_6xx_restore        /* Check NAP */
+       bt-     9,4f                    /* Check NAP */
 END_FTR_SECTION_IFSET(CPU_FTR_CAN_NAP)
 #endif /* CONFIG_6xx */
        .globl transfer_to_handler_cont
@@ -157,6 +157,10 @@ transfer_to_handler_cont:
        SYNC
        RFI                             /* jump to handler, enable MMU */
 
+#ifdef CONFIG_6xx      
+4:     b       power_save_6xx_restore
+#endif
+
 /*
  * On kernel stack overflow, load up an initial stack pointer
  * and call StackOverflow(regs), which should not return.