diff options
Diffstat (limited to 'arch/x86/kernel/traps.c')
-rw-r--r-- | arch/x86/kernel/traps.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index acb8c0585ab9..c05430ac1b44 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c | |||
@@ -61,7 +61,7 @@ | |||
61 | #include <asm/proto.h> | 61 | #include <asm/proto.h> |
62 | #else | 62 | #else |
63 | #include <asm/processor-flags.h> | 63 | #include <asm/processor-flags.h> |
64 | #include <asm/arch_hooks.h> | 64 | #include <asm/setup.h> |
65 | #include <asm/traps.h> | 65 | #include <asm/traps.h> |
66 | 66 | ||
67 | #include "cpu/mcheck/mce.h" | 67 | #include "cpu/mcheck/mce.h" |
@@ -942,7 +942,7 @@ dotraplinkage void do_iret_error(struct pt_regs *regs, long error_code) | |||
942 | info.si_signo = SIGILL; | 942 | info.si_signo = SIGILL; |
943 | info.si_errno = 0; | 943 | info.si_errno = 0; |
944 | info.si_code = ILL_BADSTK; | 944 | info.si_code = ILL_BADSTK; |
945 | info.si_addr = 0; | 945 | info.si_addr = NULL; |
946 | if (notify_die(DIE_TRAP, "iret exception", | 946 | if (notify_die(DIE_TRAP, "iret exception", |
947 | regs, error_code, 32, SIGILL) == NOTIFY_STOP) | 947 | regs, error_code, 32, SIGILL) == NOTIFY_STOP) |
948 | return; | 948 | return; |
@@ -1026,6 +1026,6 @@ void __init trap_init(void) | |||
1026 | cpu_init(); | 1026 | cpu_init(); |
1027 | 1027 | ||
1028 | #ifdef CONFIG_X86_32 | 1028 | #ifdef CONFIG_X86_32 |
1029 | trap_init_hook(); | 1029 | x86_quirk_trap_init(); |
1030 | #endif | 1030 | #endif |
1031 | } | 1031 | } |