linux-next: build failure after merge of the moduleh tree

[Stephen Rothwell]

Hi Paul,

After merging the moduleh tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

arch/x86/kernel/nmi.c:195:1: warning: data definition has no type or storage class [enabled by default]
arch/x86/kernel/nmi.c:195:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
arch/x86/kernel/nmi.c:195:1: warning: parameter names (without types) in function declaration [enabled by default]
arch/x86/kernel/nmi.c:208:1: warning: data definition has no type or storage class [enabled by default]
arch/x86/kernel/nmi.c:208:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' [-Wimplicit-int]
arch/x86/kernel/nmi.c:208:1: warning: parameter names (without types) in function declaration [enabled by default]

ERROR: "register_nmi_handler" [drivers/watchdog/hpwdt.ko] undefined!
ERROR: "unregister_nmi_handler" [drivers/watchdog/hpwdt.ko] undefined!
ERROR: "unregister_nmi_handler" [drivers/char/ipmi/ipmi_watchdog.ko] undefined!
ERROR: "register_nmi_handler" [drivers/char/ipmi/ipmi_watchdog.ko] undefined!
ERROR: "register_nmi_handler" [arch/x86/oprofile/oprofile.ko] undefined!
ERROR: "unregister_nmi_handler" [arch/x86/oprofile/oprofile.ko] undefined!
ERROR: "register_nmi_handler" [arch/x86/kernel/cpu/mcheck/mce-inject.ko] undefined!

Caused by commit 9c48f1c629ec ("x86, nmi: Wire up NMI handlers to new
routines") from the tip tree interacting with the modul.h split up.

I have added the following patch for today.

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Tue, 11 Oct 2011 19:36:20 +1100
Subject: [PATCH] x86, nmi: include export.h for EXPORT_SYBBOL

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 arch/x86/kernel/nmi.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
index 7ec5bd1..b9c8628 100644
--- a/arch/x86/kernel/nmi.c
+++ b/arch/x86/kernel/nmi.c
@@ -17,6 +17,7 @@
 #include <linux/delay.h>
 #include <linux/hardirq.h>
 #include <linux/slab.h>
+#include <linux/export.h>
 
 #include <linux/mca.h>
 
-- 
1.7.6.3

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature