[POWERPC] Clean up access to thread_info in assembly

Use (31-THREAD_SHIFT) to get to thread_info from stack pointer.  This makes
the code a bit easier to read and more robust if we ever change THREAD_SHIFT.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S
index 9d2c56621f1e..92ccc6fcc5b0 100644
--- a/arch/powerpc/kernel/misc_32.S
+++ b/arch/powerpc/kernel/misc_32.S
@@ -152,7 +152,7 @@ _GLOBAL(low_choose_750fx_pll)
         mtspr   SPRN_HID1,r4
 
         /* Store new HID1 image */
-        rlwinm  r6,r1,0,0,18
+        rlwinm  r6,r1,0,0,(31-THREAD_SHIFT)
         lwz     r6,TI_CPU(r6)
         slwi    r6,r6,2
         addis   r6,r6,nap_save_hid1@ha
@@ -281,7 +281,7 @@ _GLOBAL(_tlbia)
 #endif /* CONFIG_SMP */
 #else /* !(CONFIG_40x || CONFIG_44x || CONFIG_FSL_BOOKE) */
 #if defined(CONFIG_SMP)
-        rlwinm  r8,r1,0,0,18
+        rlwinm  r8,r1,0,0,(31-THREAD_SHIFT)
         lwz     r8,TI_CPU(r8)
         oris    r8,r8,10
         mfmsr   r10
@@ -377,7 +377,7 @@ _GLOBAL(_tlbie)
 #endif /* CONFIG_SMP */
 #else /* !(CONFIG_40x || CONFIG_44x || CONFIG_FSL_BOOKE) */
 #if defined(CONFIG_SMP)
-        rlwinm  r8,r1,0,0,18
+        rlwinm  r8,r1,0,0,(31-THREAD_SHIFT)
         lwz     r8,TI_CPU(r8)
         oris    r8,r8,11
         mfmsr   r10