diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/traps_32.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c index 5ab4c3fc7c1d..86c808b4dafb 100644 --- a/arch/x86/kernel/traps_32.c +++ b/arch/x86/kernel/traps_32.c | |||
@@ -641,7 +641,7 @@ DO_ERROR(9, SIGFPE, "coprocessor segment overrun", coprocessor_segment_overrun) | |||
641 | DO_ERROR(10, SIGSEGV, "invalid TSS", invalid_TSS) | 641 | DO_ERROR(10, SIGSEGV, "invalid TSS", invalid_TSS) |
642 | DO_ERROR(11, SIGBUS, "segment not present", segment_not_present) | 642 | DO_ERROR(11, SIGBUS, "segment not present", segment_not_present) |
643 | DO_ERROR(12, SIGBUS, "stack segment", stack_segment) | 643 | DO_ERROR(12, SIGBUS, "stack segment", stack_segment) |
644 | DO_TRAP_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0, 0) | 644 | DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0, 0) |
645 | DO_TRAP_INFO(32, SIGILL, "iret exception", iret_error, ILL_BADSTK, 0, 1) | 645 | DO_TRAP_INFO(32, SIGILL, "iret exception", iret_error, ILL_BADSTK, 0, 1) |
646 | 646 | ||
647 | void __kprobes | 647 | void __kprobes |
@@ -1281,7 +1281,7 @@ void __init trap_init(void) | |||
1281 | set_intr_gate(14, &page_fault); | 1281 | set_intr_gate(14, &page_fault); |
1282 | set_intr_gate(15, &spurious_interrupt_bug); | 1282 | set_intr_gate(15, &spurious_interrupt_bug); |
1283 | set_intr_gate(16, &coprocessor_error); | 1283 | set_intr_gate(16, &coprocessor_error); |
1284 | set_trap_gate(17, &alignment_check); | 1284 | set_intr_gate(17, &alignment_check); |
1285 | #ifdef CONFIG_X86_MCE | 1285 | #ifdef CONFIG_X86_MCE |
1286 | set_trap_gate(18, &machine_check); | 1286 | set_trap_gate(18, &machine_check); |
1287 | #endif | 1287 | #endif |