diff options
| author |   Andy Lutomirski <luto@kernel.org> | 2017-11-02 00:58:59 -0700 |
|---|---|---|
| committer |   Ingo Molnar <mingo@kernel.org> | 2017-11-02 11:04:37 +0100 |
| commit | 26c4ef9c49d8a0341f6d97ce2cfdd55d1236ed29 (patch) | |
| tree | c20569261357d40a9da6357af2488554d3a281ae /arch/x86/entry/entry_64_compat.S | |
| parent | x86/entry/64: Remove the restore_c_regs_and_iret label (diff) | |
| download | linux-dev-26c4ef9c49d8a0341f6d97ce2cfdd55d1236ed29.tar.xz linux-dev-26c4ef9c49d8a0341f6d97ce2cfdd55d1236ed29.zip | |
x86/entry/64: Split the IRET-to-user and IRET-to-kernel paths
These code paths will diverge soon.
Signed-off-by: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bpetkov@suse.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/dccf8c7b3750199b4b30383c812d4e2931811509.1509609304.git.luto@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/entry/entry_64_compat.S')
| -rw-r--r-- | arch/x86/entry/entry_64_compat.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/entry/entry_64_compat.S b/arch/x86/entry/entry_64_compat.S index e26c25ca7756..9ca014a99968 100644 --- a/arch/x86/entry/entry_64_compat.S +++ b/arch/x86/entry/entry_64_compat.S @@ -337,7 +337,7 @@ ENTRY(entry_INT80_compat) /* Go back to user mode. */ TRACE_IRQS_ON SWAPGS - jmp restore_regs_and_iret + jmp restore_regs_and_return_to_usermode END(entry_INT80_compat) ENTRY(stub32_clone) |