diff options
| author | Hidetoshi Seto | 2009-06-15 10:22:15 +0200 |
|---|---|---|
| committer | H. Peter Anvin | 2009-06-17 01:56:07 +0200 |
| commit | 9e55e44e39798541ba39d57f4b569deb555ae1ce (patch) | |
| tree | acc9797ff2e9f6294bb2b3b4f6a7ba09d7061a3c /arch/x86/kernel/cpu/mcheck/k7.c | |
| parent | x86, mce: sysfs entries for new mce options (diff) | |
| download | kernel-qcow2-linux-9e55e44e39798541ba39d57f4b569deb555ae1ce.tar.gz kernel-qcow2-linux-9e55e44e39798541ba39d57f4b569deb555ae1ce.tar.xz kernel-qcow2-linux-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/cpu/mcheck/k7.c')
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/k7.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/k7.c b/arch/x86/kernel/cpu/mcheck/k7.c index 89e510424152..b945d5dbc609 100644 --- a/arch/x86/kernel/cpu/mcheck/k7.c +++ b/arch/x86/kernel/cpu/mcheck/k7.c @@ -10,10 +10,9 @@ #include <asm/processor.h> #include <asm/system.h> +#include <asm/mce.h> #include <asm/msr.h> -#include "mce.h" - /* Machine Check Handler For AMD Athlon/Duron: */ static void k7_machine_check(struct pt_regs *regs, long error_code) { |