aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/entry_32.S
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/kernel/entry_32.S')
-rw-r--r--arch/powerpc/kernel/entry_32.S8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index fe21674d4f06..ab2d62f70b14 100644
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -176,14 +176,14 @@ transfer_to_handler:
176 cmplw r1,r9 /* if r1 <= ksp_limit */ 176 cmplw r1,r9 /* if r1 <= ksp_limit */
177 ble- stack_ovf /* then the kernel stack overflowed */ 177 ble- stack_ovf /* then the kernel stack overflowed */
1785: 1785:
179#ifdef CONFIG_6xx 179#if defined(CONFIG_6xx) || defined(CONFIG_E500)
180 rlwinm r9,r1,0,0,31-THREAD_SHIFT 180 rlwinm r9,r1,0,0,31-THREAD_SHIFT
181 tophys(r9,r9) /* check local flags */ 181 tophys(r9,r9) /* check local flags */
182 lwz r12,TI_LOCAL_FLAGS(r9) 182 lwz r12,TI_LOCAL_FLAGS(r9)
183 mtcrf 0x01,r12 183 mtcrf 0x01,r12
184 bt- 31-TLF_NAPPING,4f 184 bt- 31-TLF_NAPPING,4f
185 bt- 31-TLF_SLEEPING,7f 185 bt- 31-TLF_SLEEPING,7f
186#endif /* CONFIG_6xx */ 186#endif /* CONFIG_6xx || CONFIG_E500 */
187 .globl transfer_to_handler_cont 187 .globl transfer_to_handler_cont
188transfer_to_handler_cont: 188transfer_to_handler_cont:
1893: 1893:
@@ -196,10 +196,10 @@ transfer_to_handler_cont:
196 SYNC 196 SYNC
197 RFI /* jump to handler, enable MMU */ 197 RFI /* jump to handler, enable MMU */
198 198
199#ifdef CONFIG_6xx 199#if defined (CONFIG_6xx) || defined(CONFIG_E500)
2004: rlwinm r12,r12,0,~_TLF_NAPPING 2004: rlwinm r12,r12,0,~_TLF_NAPPING
201 stw r12,TI_LOCAL_FLAGS(r9) 201 stw r12,TI_LOCAL_FLAGS(r9)
202 b power_save_6xx_restore 202 b power_save_ppc32_restore
203 203
2047: rlwinm r12,r12,0,~_TLF_SLEEPING 2047: rlwinm r12,r12,0,~_TLF_SLEEPING
205 stw r12,TI_LOCAL_FLAGS(r9) 205 stw r12,TI_LOCAL_FLAGS(r9)