diff options
Diffstat (limited to 'arch/x86/kernel/entry_32.S')
| -rw-r--r-- | arch/x86/kernel/entry_32.S | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S index 109792bc7cfa..b21fbfaffe39 100644 --- a/arch/x86/kernel/entry_32.S +++ b/arch/x86/kernel/entry_32.S | |||
| @@ -730,6 +730,7 @@ error_code: | |||
| 730 | movl $(__USER_DS), %ecx | 730 | movl $(__USER_DS), %ecx |
| 731 | movl %ecx, %ds | 731 | movl %ecx, %ds |
| 732 | movl %ecx, %es | 732 | movl %ecx, %es |
| 733 | TRACE_IRQS_OFF | ||
| 733 | movl %esp,%eax # pt_regs pointer | 734 | movl %esp,%eax # pt_regs pointer |
| 734 | call *%edi | 735 | call *%edi |
| 735 | jmp ret_from_exception | 736 | jmp ret_from_exception |
| @@ -760,20 +761,9 @@ ENTRY(device_not_available) | |||
| 760 | RING0_INT_FRAME | 761 | RING0_INT_FRAME |
| 761 | pushl $-1 # mark this as an int | 762 | pushl $-1 # mark this as an int |
| 762 | CFI_ADJUST_CFA_OFFSET 4 | 763 | CFI_ADJUST_CFA_OFFSET 4 |
| 763 | SAVE_ALL | 764 | pushl $do_device_not_available |
| 764 | GET_CR0_INTO_EAX | ||
| 765 | testl $0x4, %eax # EM (math emulation bit) | ||
| 766 | jne device_not_available_emulate | ||
| 767 | preempt_stop(CLBR_ANY) | ||
| 768 | call math_state_restore | ||
| 769 | jmp ret_from_exception | ||
| 770 | device_not_available_emulate: | ||
| 771 | pushl $0 # temporary storage for ORIG_EIP | ||
| 772 | CFI_ADJUST_CFA_OFFSET 4 | 765 | CFI_ADJUST_CFA_OFFSET 4 |
| 773 | call math_emulate | 766 | jmp error_code |
| 774 | addl $4, %esp | ||
| 775 | CFI_ADJUST_CFA_OFFSET -4 | ||
| 776 | jmp ret_from_exception | ||
| 777 | CFI_ENDPROC | 767 | CFI_ENDPROC |
| 778 | END(device_not_available) | 768 | END(device_not_available) |
| 779 | 769 | ||
| @@ -814,6 +804,7 @@ debug_stack_correct: | |||
| 814 | pushl $-1 # mark this as an int | 804 | pushl $-1 # mark this as an int |
| 815 | CFI_ADJUST_CFA_OFFSET 4 | 805 | CFI_ADJUST_CFA_OFFSET 4 |
| 816 | SAVE_ALL | 806 | SAVE_ALL |
| 807 | TRACE_IRQS_OFF | ||
| 817 | xorl %edx,%edx # error code 0 | 808 | xorl %edx,%edx # error code 0 |
| 818 | movl %esp,%eax # pt_regs pointer | 809 | movl %esp,%eax # pt_regs pointer |
| 819 | call do_debug | 810 | call do_debug |
| @@ -858,6 +849,7 @@ nmi_stack_correct: | |||
| 858 | pushl %eax | 849 | pushl %eax |
| 859 | CFI_ADJUST_CFA_OFFSET 4 | 850 | CFI_ADJUST_CFA_OFFSET 4 |
| 860 | SAVE_ALL | 851 | SAVE_ALL |
| 852 | TRACE_IRQS_OFF | ||
| 861 | xorl %edx,%edx # zero error code | 853 | xorl %edx,%edx # zero error code |
| 862 | movl %esp,%eax # pt_regs pointer | 854 | movl %esp,%eax # pt_regs pointer |
| 863 | call do_nmi | 855 | call do_nmi |
| @@ -898,6 +890,7 @@ nmi_espfix_stack: | |||
| 898 | pushl %eax | 890 | pushl %eax |
| 899 | CFI_ADJUST_CFA_OFFSET 4 | 891 | CFI_ADJUST_CFA_OFFSET 4 |
| 900 | SAVE_ALL | 892 | SAVE_ALL |
| 893 | TRACE_IRQS_OFF | ||
| 901 | FIXUP_ESPFIX_STACK # %eax == %esp | 894 | FIXUP_ESPFIX_STACK # %eax == %esp |
| 902 | xorl %edx,%edx # zero error code | 895 | xorl %edx,%edx # zero error code |
| 903 | call do_nmi | 896 | call do_nmi |
| @@ -928,6 +921,7 @@ KPROBE_ENTRY(int3) | |||
| 928 | pushl $-1 # mark this as an int | 921 | pushl $-1 # mark this as an int |
| 929 | CFI_ADJUST_CFA_OFFSET 4 | 922 | CFI_ADJUST_CFA_OFFSET 4 |
| 930 | SAVE_ALL | 923 | SAVE_ALL |
| 924 | TRACE_IRQS_OFF | ||
| 931 | xorl %edx,%edx # zero error code | 925 | xorl %edx,%edx # zero error code |
| 932 | movl %esp,%eax # pt_regs pointer | 926 | movl %esp,%eax # pt_regs pointer |
| 933 | call do_int3 | 927 | call do_int3 |
| @@ -1030,7 +1024,7 @@ ENTRY(machine_check) | |||
| 1030 | RING0_INT_FRAME | 1024 | RING0_INT_FRAME |
| 1031 | pushl $0 | 1025 | pushl $0 |
| 1032 | CFI_ADJUST_CFA_OFFSET 4 | 1026 | CFI_ADJUST_CFA_OFFSET 4 |
| 1033 | pushl machine_check_vector | 1027 | pushl $do_machine_check |
| 1034 | CFI_ADJUST_CFA_OFFSET 4 | 1028 | CFI_ADJUST_CFA_OFFSET 4 |
| 1035 | jmp error_code | 1029 | jmp error_code |
| 1036 | CFI_ENDPROC | 1030 | CFI_ENDPROC |