diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-10-06 14:20:27 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-10-10 06:57:21 +0200 |
| commit | d48b0e173715f678698d3678fefd40f2893ce798 (patch) | |
| tree | 83eb4fe81f31225229cbcb720f6c343f8692ee88 | |
| parent | b716916679e72054d436afadce2f94dcad71cfad (diff) | |
| download | blackbird-op-linux-d48b0e173715f678698d3678fefd40f2893ce798.tar.gz blackbird-op-linux-d48b0e173715f678698d3678fefd40f2893ce798.zip | |
x86, nmi, drivers: Fix nmi splitup build bug
nmi.c needs an #include <linux/mca.h>:
arch/x86/kernel/nmi.c: In function ‘unknown_nmi_error’:
arch/x86/kernel/nmi.c:286:6: error: ‘MCA_bus’ undeclared (first use in this function)
arch/x86/kernel/nmi.c:286:6: note: each undeclared identifier is reported only once for each function it appears in
Another one is the hpwdt driver:
drivers/watchdog/hpwdt.c:507:9: error: ‘NMI_DONE’ undeclared (first use in this function)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/x86/kernel/nmi.c | 2 | ||||
| -rw-r--r-- | drivers/watchdog/hpwdt.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c index d0eaa31b9f37..7ec5bd140b87 100644 --- a/arch/x86/kernel/nmi.c +++ b/arch/x86/kernel/nmi.c @@ -18,6 +18,8 @@ #include <linux/hardirq.h> #include <linux/slab.h> +#include <linux/mca.h> + #if defined(CONFIG_EDAC) #include <linux/edac.h> #endif diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index 7e7feac05221..3774c9b8dac9 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c @@ -35,6 +35,7 @@ #include <linux/notifier.h> #include <asm/cacheflush.h> #endif /* CONFIG_HPWDT_NMI_DECODING */ +#include <asm/nmi.h> #define HPWDT_VERSION "1.3.0" #define SECS_TO_TICKS(secs) ((secs) * 1000 / 128) |
