From fe5a172bc7ed9b7f3f50a5f2bdd7111d5e032dea Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Tue, 26 Aug 2008 12:08:56 +1000 Subject: [PATCH] --- yaml --- r: 109471 b: refs/heads/master c: 7888bc2b4778fda267a6e6422c4497dba865a47a h: refs/heads/master i: 109469: 7d60fff5d9618f78b215c428f2601f55f1b659ed 109467: 97e99f4b78c45adb6cbfed7601e5da892c14fe03 109463: 192a126bc85a7e083c425e5fda1cf80295105142 109455: ffc47daa2f6f66965d924de1c83656d7a6ce1abd 109439: 7ae2b0cf74feb28b7b62d2d55cbcb59b8a35ed73 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/idle_6xx.S | 2 +- trunk/arch/powerpc/kernel/idle_e500.S | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8500e268f07d..6e286d2b6224 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94ee815c05c9387931e549d83312d30009ed86e9 +refs/heads/master: 7888bc2b4778fda267a6e6422c4497dba865a47a diff --git a/trunk/arch/powerpc/kernel/idle_6xx.S b/trunk/arch/powerpc/kernel/idle_6xx.S index 019b02d8844f..15c611de1ee2 100644 --- a/trunk/arch/powerpc/kernel/idle_6xx.S +++ b/trunk/arch/powerpc/kernel/idle_6xx.S @@ -158,7 +158,7 @@ _GLOBAL(power_save_ppc32_restore) stw r9,_NIP(r11) /* make it do a blr */ #ifdef CONFIG_SMP - mfspr r12,SPRN_SPRG3 + rlwinm r12,r11,0,0,31-THREAD_SHIFT lwz r11,TI_CPU(r12) /* get cpu number * 4 */ slwi r11,r11,2 #else diff --git a/trunk/arch/powerpc/kernel/idle_e500.S b/trunk/arch/powerpc/kernel/idle_e500.S index 06304034b393..47a1a983ff88 100644 --- a/trunk/arch/powerpc/kernel/idle_e500.S +++ b/trunk/arch/powerpc/kernel/idle_e500.S @@ -84,10 +84,11 @@ _GLOBAL(power_save_ppc32_restore) stw r9,_NIP(r11) /* make it do a blr */ #ifdef CONFIG_SMP - mfspr r12,SPRN_SPRG3 + rlwinm r12,r1,0,0,31-THREAD_SHIFT lwz r11,TI_CPU(r12) /* get cpu number * 4 */ slwi r11,r11,2 #else li r11,0 #endif + b transfer_to_handler_cont