diff options
Diffstat (limited to 'arch/x86/kernel/entry_32.S')
-rw-r--r-- | arch/x86/kernel/entry_32.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S index 159a1c76d2bd..53393c306e11 100644 --- a/arch/x86/kernel/entry_32.S +++ b/arch/x86/kernel/entry_32.S | |||
@@ -58,7 +58,7 @@ | |||
58 | * for paravirtualization. The following will never clobber any registers: | 58 | * for paravirtualization. The following will never clobber any registers: |
59 | * INTERRUPT_RETURN (aka. "iret") | 59 | * INTERRUPT_RETURN (aka. "iret") |
60 | * GET_CR0_INTO_EAX (aka. "movl %cr0, %eax") | 60 | * GET_CR0_INTO_EAX (aka. "movl %cr0, %eax") |
61 | * ENABLE_INTERRUPTS_SYSCALL_RET (aka "sti; sysexit"). | 61 | * ENABLE_INTERRUPTS_SYSEXIT (aka "sti; sysexit"). |
62 | * | 62 | * |
63 | * For DISABLE_INTERRUPTS/ENABLE_INTERRUPTS (aka "cli"/"sti"), you must | 63 | * For DISABLE_INTERRUPTS/ENABLE_INTERRUPTS (aka "cli"/"sti"), you must |
64 | * specify what registers can be overwritten (CLBR_NONE, CLBR_EAX/EDX/ECX/ANY). | 64 | * specify what registers can be overwritten (CLBR_NONE, CLBR_EAX/EDX/ECX/ANY). |
@@ -349,7 +349,7 @@ sysenter_past_esp: | |||
349 | xorl %ebp,%ebp | 349 | xorl %ebp,%ebp |
350 | TRACE_IRQS_ON | 350 | TRACE_IRQS_ON |
351 | 1: mov PT_FS(%esp), %fs | 351 | 1: mov PT_FS(%esp), %fs |
352 | ENABLE_INTERRUPTS_SYSCALL_RET | 352 | ENABLE_INTERRUPTS_SYSEXIT |
353 | CFI_ENDPROC | 353 | CFI_ENDPROC |
354 | .pushsection .fixup,"ax" | 354 | .pushsection .fixup,"ax" |
355 | 2: movl $0,PT_FS(%esp) | 355 | 2: movl $0,PT_FS(%esp) |
@@ -874,10 +874,10 @@ ENTRY(native_iret) | |||
874 | .previous | 874 | .previous |
875 | END(native_iret) | 875 | END(native_iret) |
876 | 876 | ||
877 | ENTRY(native_irq_enable_syscall_ret) | 877 | ENTRY(native_irq_enable_sysexit) |
878 | sti | 878 | sti |
879 | sysexit | 879 | sysexit |
880 | END(native_irq_enable_syscall_ret) | 880 | END(native_irq_enable_sysexit) |
881 | #endif | 881 | #endif |
882 | 882 | ||
883 | KPROBE_ENTRY(int3) | 883 | KPROBE_ENTRY(int3) |