x86/paravirt: split sysret and sysexit

[deliverable/linux.git] / arch / x86 / kernel / entry_64.S

diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index 6d1101469e9757f72311fa3230043dd5534433f7..0056bc4c61a9b22c1d713f2ea3b8924c792f00e3 100644 (file)
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -59,7 +59,7 @@
 #endif 
 
 #ifdef CONFIG_PARAVIRT
-ENTRY(native_irq_enable_syscall_ret)
+ENTRY(native_usersp_sysret)
        movq    %gs:pda_oldrsp,%rsp
        swapgs
        sysretq
@@ -275,7 +275,7 @@ sysret_check:
        CFI_REGISTER    rip,rcx
        RESTORE_ARGS 0,-ARG_SKIP,1
        /*CFI_REGISTER  rflags,r11*/
-       ENABLE_INTERRUPTS_SYSCALL_RET
+       USERSP_SYSRET
 
        CFI_RESTORE_STATE
        /* Handle reschedules */