diff options
| author | Brian Gerst <brgerst@gmail.com> | 2009-11-03 20:02:05 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-11-03 20:50:02 +0100 |
| commit | 97829de5a3b88899c5f3ac8802d11868bf4180ba (patch) | |
| tree | b4894670eaed251c3f42c9b6da4b05df54e6db45 | |
| parent | x86: Don't use the strict copy checks when branch profiling is in use (diff) | |
| download | linux-97829de5a3b88899c5f3ac8802d11868bf4180ba.tar.xz linux-97829de5a3b88899c5f3ac8802d11868bf4180ba.zip | |
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>
| -rw-r--r-- | 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 af0f4b226dbe..1579a6c59cfd 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) |