diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-20 10:54:22 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-20 10:54:22 +0200 |
| commit | 1d99100120ead486cd7a2502f19eaf1c1699d806 (patch) | |
| tree | e9b5157c93d365f107e341a81a6b5b3946ea1785 /arch/x86/kernel/traps.c | |
| parent | bc3f5d3dbd576da94a575b1477b8e38551bf11da (diff) | |
| parent | b1f49f9582f9be6de5055cfa97eabf6246f2eaf7 (diff) | |
Merge branch 'x86/mce3' into x86/urgent
Diffstat (limited to 'arch/x86/kernel/traps.c')
| -rw-r--r-- | arch/x86/kernel/traps.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index 1e1e27b7d438..71f9c74814d8 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -53,6 +53,7 @@ #include <asm/traps.h> #include <asm/desc.h> #include <asm/i387.h> +#include <asm/mce.h> #include <asm/mach_traps.h> @@ -64,8 +65,6 @@ #include <asm/setup.h> #include <asm/traps.h> -#include "cpu/mcheck/mce.h" - asmlinkage int system_call(void); /* Do we ignore FPU interrupts ? */ |