summaryrefslogtreecommitdiff
path: root/arch/powerpc/kernel/idle_e500.S
diff options
context:
space:
mode:
authorStuart Yoder <stuart.yoder@freescale.com>2012-07-05 08:41:35 +0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-07-11 08:18:22 +0400
commit9778b696a0188ad3b3524b383953ee73b31b7b68 (patch)
treeae706a4c23f3e5da85c6bc6e33a534eb20d0d338 /arch/powerpc/kernel/idle_e500.S
parentdb9112173b185995b80f56e136bd2ae44e4e6366 (diff)
downloadlinux-9778b696a0188ad3b3524b383953ee73b31b7b68.tar.xz
powerpc: Use CURRENT_THREAD_INFO instead of open coded assembly
Signed-off-by: Stuart Yoder <stuart.yoder@freescale.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel/idle_e500.S')
-rw-r--r--arch/powerpc/kernel/idle_e500.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/idle_e500.S b/arch/powerpc/kernel/idle_e500.S
index 4f0ab85f3788..15448668988d 100644
--- a/arch/powerpc/kernel/idle_e500.S
+++ b/arch/powerpc/kernel/idle_e500.S
@@ -21,7 +21,7 @@
.text
_GLOBAL(e500_idle)
- rlwinm r3,r1,0,0,31-THREAD_SHIFT /* current thread_info */
+ CURRENT_THREAD_INFO(r3, r1)
lwz r4,TI_LOCAL_FLAGS(r3) /* set napping bit */
ori r4,r4,_TLF_NAPPING /* so when we take an exception */
stw r4,TI_LOCAL_FLAGS(r3) /* it will return to our caller */
@@ -96,7 +96,7 @@ _GLOBAL(power_save_ppc32_restore)
stw r9,_NIP(r11) /* make it do a blr */
#ifdef CONFIG_SMP
- rlwinm r12,r1,0,0,31-THREAD_SHIFT
+ CURRENT_THREAD_INFO(r12, r1)
lwz r11,TI_CPU(r12) /* get cpu number * 4 */
slwi r11,r11,2
#else