Messages in this thread Patch in this message | | | Date | Sun, 03 Feb 2008 14:18:12 +0800 | From | Li Zefan <> | Subject | [PATCH] x86: fix compile waring building without CONFIG_SYSCTL |
| |
building without CONFIG_SYSCTL:
arch/x86/kernel/nmi_64.c:50: warning: 'unknown_nmi_panic_callback' declared 'static' but never defined
This patch also fixes nmi_32.c
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
--- arch/x86/kernel/nmi_32.c | 3 ++- arch/x86/kernel/nmi_64.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/nmi_32.c b/arch/x86/kernel/nmi_32.c index edd4136..7e5ee4f 100644 --- a/arch/x86/kernel/nmi_32.c +++ b/arch/x86/kernel/nmi_32.c @@ -46,8 +46,9 @@ static unsigned int nmi_hz = HZ; static DEFINE_PER_CPU(short, wd_enabled); -/* local prototypes */ +#ifdef CONFIG_SYSCTL static int unknown_nmi_panic_callback(struct pt_regs *regs, int cpu); +#endif static int endflag __initdata = 0; diff --git a/arch/x86/kernel/nmi_64.c b/arch/x86/kernel/nmi_64.c index fb99484..8fff383 100644 --- a/arch/x86/kernel/nmi_64.c +++ b/arch/x86/kernel/nmi_64.c @@ -46,8 +46,9 @@ static unsigned int nmi_hz = HZ; static DEFINE_PER_CPU(short, wd_enabled); -/* local prototypes */ +#ifdef CONFIG_SYSCTL static int unknown_nmi_panic_callback(struct pt_regs *regs, int cpu); +#endif /* Run after command line and cpu_init init, but before all other checks */ void nmi_watchdog_default(void) -- 1.5.4.rc3
| |