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/kernel/exceptions-64s.S | |
| 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/kernel/exceptions-64s.S')
| -rw-r--r-- | arch/powerpc/kernel/exceptions-64s.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 1c06d2971545..8ad346882684 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S | |||
| @@ -851,7 +851,7 @@ BEGIN_FTR_SECTION | |||
| 851 | bne- do_ste_alloc /* If so handle it */ | 851 | bne- do_ste_alloc /* If so handle it */ |
| 852 | END_MMU_FTR_SECTION_IFCLR(MMU_FTR_SLB) | 852 | END_MMU_FTR_SECTION_IFCLR(MMU_FTR_SLB) |
| 853 | 853 | ||
| 854 | clrrdi r11,r1,THREAD_SHIFT | 854 | CURRENT_THREAD_INFO(r11, r1) |
| 855 | lwz r0,TI_PREEMPT(r11) /* If we're in an "NMI" */ | 855 | lwz r0,TI_PREEMPT(r11) /* If we're in an "NMI" */ |
| 856 | andis. r0,r0,NMI_MASK@h /* (i.e. an irq when soft-disabled) */ | 856 | andis. r0,r0,NMI_MASK@h /* (i.e. an irq when soft-disabled) */ |
| 857 | bne 77f /* then don't call hash_page now */ | 857 | bne 77f /* then don't call hash_page now */ |