[tip:x86/asm] x86, 64-bit: Fix bstep_iret jump

From: tip-bot for Brian Gerst
Date: Wed Nov 04 2009 - 01:34:18 EST


Commit-ID: 97829de5a3b88899c5f3ac8802d11868bf4180ba
Gitweb: http://git.kernel.org/tip/97829de5a3b88899c5f3ac8802d11868bf4180ba
Author: Brian Gerst <brgerst@xxxxxxxxx>
AuthorDate: Tue, 3 Nov 2009 14:02:05 -0500
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Tue, 3 Nov 2009 20:50:02 +0100

x86, 64-bit: Fix bstep_iret jump

This jump should be unconditional.

Signed-off-by: Brian Gerst <brgerst@xxxxxxxxx>
LKML-Reference: <1257274925-15713-1-git-send-email-brgerst@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
arch/x86/kernel/entry_64.S | 2 +-
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)


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/