diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:31:58 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:31:58 -0400 |
| commit | 9e165acf1b9e37af7c0fa39399b43d0bd8600039 (patch) | |
| tree | 7ffdb0ad4c35ac9c19c4096b4f22ccc9b1eeefad /arch/powerpc/kernel/idle_6xx.S | |
| parent | 6a4690c22f5da1eb1c898b61b6a80da52fbd976f (diff) | |
| parent | 791ccf2e4deeea8426b389fd0f5bb0e9167bb75d (diff) | |
Merge branch 'at91' into devel
Diffstat (limited to 'arch/powerpc/kernel/idle_6xx.S')
| -rw-r--r-- | arch/powerpc/kernel/idle_6xx.S | 2 |
1 files changed, 1 insertions, 1 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 |