diff options
Diffstat (limited to 'arch/x86/kernel/entry_32.S')
-rw-r--r-- | arch/x86/kernel/entry_32.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S index 153bb87a4eea..6a474e1028c7 100644 --- a/arch/x86/kernel/entry_32.S +++ b/arch/x86/kernel/entry_32.S | |||
@@ -288,7 +288,7 @@ ENTRY(ia32_sysenter_target) | |||
288 | CFI_SIGNAL_FRAME | 288 | CFI_SIGNAL_FRAME |
289 | CFI_DEF_CFA esp, 0 | 289 | CFI_DEF_CFA esp, 0 |
290 | CFI_REGISTER esp, ebp | 290 | CFI_REGISTER esp, ebp |
291 | movl TSS_sysenter_esp0(%esp),%esp | 291 | movl TSS_sysenter_sp0(%esp),%esp |
292 | sysenter_past_esp: | 292 | sysenter_past_esp: |
293 | /* | 293 | /* |
294 | * No need to follow this irqs on/off section: the syscall | 294 | * No need to follow this irqs on/off section: the syscall |
@@ -743,7 +743,7 @@ END(device_not_available) | |||
743 | * that sets up the real kernel stack. Check here, since we can't | 743 | * that sets up the real kernel stack. Check here, since we can't |
744 | * allow the wrong stack to be used. | 744 | * allow the wrong stack to be used. |
745 | * | 745 | * |
746 | * "TSS_sysenter_esp0+12" is because the NMI/debug handler will have | 746 | * "TSS_sysenter_sp0+12" is because the NMI/debug handler will have |
747 | * already pushed 3 words if it hits on the sysenter instruction: | 747 | * already pushed 3 words if it hits on the sysenter instruction: |
748 | * eflags, cs and eip. | 748 | * eflags, cs and eip. |
749 | * | 749 | * |
@@ -755,7 +755,7 @@ END(device_not_available) | |||
755 | cmpw $__KERNEL_CS,4(%esp); \ | 755 | cmpw $__KERNEL_CS,4(%esp); \ |
756 | jne ok; \ | 756 | jne ok; \ |
757 | label: \ | 757 | label: \ |
758 | movl TSS_sysenter_esp0+offset(%esp),%esp; \ | 758 | movl TSS_sysenter_sp0+offset(%esp),%esp; \ |
759 | CFI_DEF_CFA esp, 0; \ | 759 | CFI_DEF_CFA esp, 0; \ |
760 | CFI_UNDEFINED eip; \ | 760 | CFI_UNDEFINED eip; \ |
761 | pushfl; \ | 761 | pushfl; \ |