diff options
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/idle_6xx.S | 2 | ||||
| -rw-r--r-- | arch/powerpc/kernel/idle_e500.S | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/idle_6xx.S b/arch/powerpc/kernel/idle_6xx.S index 019b02d8844f..15c611de1ee2 100644 --- a/arch/powerpc/kernel/idle_6xx.S +++ b/arch/powerpc/kernel/idle_6xx.S | |||
| @@ -158,7 +158,7 @@ _GLOBAL(power_save_ppc32_restore) | |||
| 158 | stw r9,_NIP(r11) /* make it do a blr */ | 158 | stw r9,_NIP(r11) /* make it do a blr */ |
| 159 | 159 | ||
| 160 | #ifdef CONFIG_SMP | 160 | #ifdef CONFIG_SMP |
| 161 | mfspr r12,SPRN_SPRG3 | 161 | rlwinm r12,r11,0,0,31-THREAD_SHIFT |
| 162 | lwz r11,TI_CPU(r12) /* get cpu number * 4 */ | 162 | lwz r11,TI_CPU(r12) /* get cpu number * 4 */ |
| 163 | slwi r11,r11,2 | 163 | slwi r11,r11,2 |
| 164 | #else | 164 | #else |
diff --git a/arch/powerpc/kernel/idle_e500.S b/arch/powerpc/kernel/idle_e500.S index 06304034b393..47a1a983ff88 100644 --- a/arch/powerpc/kernel/idle_e500.S +++ b/arch/powerpc/kernel/idle_e500.S | |||
| @@ -84,10 +84,11 @@ _GLOBAL(power_save_ppc32_restore) | |||
| 84 | stw r9,_NIP(r11) /* make it do a blr */ | 84 | stw r9,_NIP(r11) /* make it do a blr */ |
| 85 | 85 | ||
| 86 | #ifdef CONFIG_SMP | 86 | #ifdef CONFIG_SMP |
| 87 | mfspr r12,SPRN_SPRG3 | 87 | rlwinm r12,r1,0,0,31-THREAD_SHIFT |
| 88 | lwz r11,TI_CPU(r12) /* get cpu number * 4 */ | 88 | lwz r11,TI_CPU(r12) /* get cpu number * 4 */ |
| 89 | slwi r11,r11,2 | 89 | slwi r11,r11,2 |
| 90 | #else | 90 | #else |
| 91 | li r11,0 | 91 | li r11,0 |
| 92 | #endif | 92 | #endif |
| 93 | |||
| 93 | b transfer_to_handler_cont | 94 | b transfer_to_handler_cont |