Merge commit 'upstream-x86-entry' into WIP.x86/mm

[thirdparty/linux.git] / arch / x86 / entry / entry_64_compat.S

diff --git a/arch/x86/entry/entry_64_compat.S b/arch/x86/entry/entry_64_compat.S
index b5c7a56ed256d4cb12d55a18bdaa045229b8093d..568e130d932cd2a7d44393e5fc52408cffe64f34 100644 (file)
--- a/arch/x86/entry/entry_64_compat.S
+++ b/arch/x86/entry/entry_64_compat.S
@@ -337,8 +337,7 @@ ENTRY(entry_INT80_compat)
 
        /* Go back to user mode. */
        TRACE_IRQS_ON
-       SWAPGS
-       jmp     restore_regs_and_iret
+       jmp     swapgs_restore_regs_and_return_to_usermode
 END(entry_INT80_compat)
 
 ENTRY(stub32_clone)