Messages in this thread Patch in this message |  | | | Date | Wed, 4 Nov 2009 06:33:42 GMT | | From | tip-bot for Brian Gerst <> | | Subject | [tip:x86/asm] x86, 64-bit: Fix bstep_iret jump |
Commit-ID: 97829de5a3b88899c5f3ac8802d11868bf4180ba Gitweb: http://git.kernel.org/tip/97829de5a3b88899c5f3ac8802d11868bf4180ba Author: Brian Gerst <brgerst@gmail.com> AuthorDate: Tue, 3 Nov 2009 14:02:05 -0500 Committer: Ingo Molnar <mingo@elte.hu> 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@gmail.com> LKML-Reference: <1257274925-15713-1-git-send-email-brgerst@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> --- 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)
|  |