summaryrefslogtreecommitdiff
path: root/arch/powerpc/kvm
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/kvm
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/kvm')
-rw-r--r--arch/powerpc/kvm/bookehv_interrupts.S6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/powerpc/kvm/bookehv_interrupts.S b/arch/powerpc/kvm/bookehv_interrupts.S
index 18cee4b0098a..1685dc43bcf2 100644
--- a/arch/powerpc/kvm/bookehv_interrupts.S
+++ b/arch/powerpc/kvm/bookehv_interrupts.S
@@ -160,11 +160,7 @@
mtspr SPRN_EPLC, r8
/* disable preemption, so we are sure we hit the fixup handler */
-#ifdef CONFIG_PPC64
- clrrdi r8,r1,THREAD_SHIFT
-#else
- rlwinm r8,r1,0,0,31-THREAD_SHIFT /* current thread_info */
-#endif
+ CURRENT_THREAD_INFO(r8, r1)
li r7, 1
stw r7, TI_PREEMPT(r8)