aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorBrian Gerst <brgerst@gmail.com>2009-11-03 14:02:05 -0500
committerIngo Molnar <mingo@elte.hu>2009-11-03 20:50:02 +0100
commit97829de5a3b88899c5f3ac8802d11868bf4180ba (patch)
treeb4894670eaed251c3f42c9b6da4b05df54e6db45 /arch
parentad8f4356af58f7ded6b4a5787c67c7cab51066b5 (diff)
downloadkernel_samsung_smdk4412-97829de5a3b88899c5f3ac8802d11868bf4180ba.zip
kernel_samsung_smdk4412-97829de5a3b88899c5f3ac8802d11868bf4180ba.tar.gz
kernel_samsung_smdk4412-97829de5a3b88899c5f3ac8802d11868bf4180ba.tar.bz2
x86, 64-bit: Fix bstep_iret jump
This jump should be unconditional. Signed-off-by: Brian Gerst <brgerst@gmail.com> LKML-Reference: <1257274925-15713-1-git-send-email-brgerst@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/entry_64.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index af0f4b2..1579a6c 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -1501,7 +1501,7 @@ error_kernelspace:
bstep_iret:
/* Fix truncated RIP */
movq %rcx,RIP+8(%rsp)
- je error_swapgs
+ jmp error_swapgs
END(error_entry)