diff options
| author |   Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> | 2009-06-15 17:22:15 +0900 |
|---|---|---|
| committer |   H. Peter Anvin <hpa@zytor.com> | 2009-06-16 16:56:07 -0700 |
| commit | 9e55e44e39798541ba39d57f4b569deb555ae1ce (patch) | |
| tree | acc9797ff2e9f6294bb2b3b4f6a7ba09d7061a3c /arch/x86/kernel/traps.c | |
| parent | x86, mce: sysfs entries for new mce options (diff) | |
| download | linux-dev-9e55e44e39798541ba39d57f4b569deb555ae1ce.tar.xz linux-dev-9e55e44e39798541ba39d57f4b569deb555ae1ce.zip | |
x86, mce: unify mce.h
There are 2 headers:
arch/x86/include/asm/mce.h
arch/x86/kernel/cpu/mcheck/mce.h
and in the latter small header:
#include <asm/mce.h>
This patch move all contents in the latter header into the former,
and fix all files using the latter to include the former instead.
Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
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 ? */ |