diff options
author | Stuart Yoder <stuart.yoder@freescale.com> | 2012-07-05 00:41:35 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-07-11 00:18:22 -0400 |
commit | 9778b696a0188ad3b3524b383953ee73b31b7b68 (patch) | |
tree | ae706a4c23f3e5da85c6bc6e33a534eb20d0d338 /arch/powerpc/include/asm/exception-64s.h | |
parent | db9112173b185995b80f56e136bd2ae44e4e6366 (diff) |
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/include/asm/exception-64s.h')
-rw-r--r-- | arch/powerpc/include/asm/exception-64s.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h index d58fc4e4149c..a43c1473915f 100644 --- a/arch/powerpc/include/asm/exception-64s.h +++ b/arch/powerpc/include/asm/exception-64s.h | |||
@@ -293,7 +293,7 @@ label##_hv: \ | |||
293 | 293 | ||
294 | #define RUNLATCH_ON \ | 294 | #define RUNLATCH_ON \ |
295 | BEGIN_FTR_SECTION \ | 295 | BEGIN_FTR_SECTION \ |
296 | clrrdi r3,r1,THREAD_SHIFT; \ | 296 | CURRENT_THREAD_INFO(r3, r1); \ |
297 | ld r4,TI_LOCAL_FLAGS(r3); \ | 297 | ld r4,TI_LOCAL_FLAGS(r3); \ |
298 | andi. r0,r4,_TLF_RUNLATCH; \ | 298 | andi. r0,r4,_TLF_RUNLATCH; \ |
299 | beql ppc64_runlatch_on_trampoline; \ | 299 | beql ppc64_runlatch_on_trampoline; \ |
@@ -332,7 +332,7 @@ label##_common: \ | |||
332 | #ifdef CONFIG_PPC_970_NAP | 332 | #ifdef CONFIG_PPC_970_NAP |
333 | #define FINISH_NAP \ | 333 | #define FINISH_NAP \ |
334 | BEGIN_FTR_SECTION \ | 334 | BEGIN_FTR_SECTION \ |
335 | clrrdi r11,r1,THREAD_SHIFT; \ | 335 | CURRENT_THREAD_INFO(r11, r1); \ |
336 | ld r9,TI_LOCAL_FLAGS(r11); \ | 336 | ld r9,TI_LOCAL_FLAGS(r11); \ |
337 | andi. r10,r9,_TLF_NAPPING; \ | 337 | andi. r10,r9,_TLF_NAPPING; \ |
338 | bnel power4_fixup_nap; \ | 338 | bnel power4_fixup_nap; \ |