* [PATCH] x86: fix compile waring building without CONFIG_SYSCTL @ 2008-02-03 6:18 Li Zefan 2008-02-03 7:12 ` Ingo Molnar 0 siblings, 1 reply; 6+ messages in thread From: Li Zefan @ 2008-02-03 6:18 UTC (permalink / raw) To: Ingo Molnar; +Cc: LKML, Thomas Gleixner, H. Peter Anvin 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 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] x86: fix compile waring building without CONFIG_SYSCTL 2008-02-03 6:18 [PATCH] x86: fix compile waring building without CONFIG_SYSCTL Li Zefan @ 2008-02-03 7:12 ` Ingo Molnar 2008-02-03 7:31 ` Li Zefan 0 siblings, 1 reply; 6+ messages in thread From: Ingo Molnar @ 2008-02-03 7:12 UTC (permalink / raw) To: Li Zefan; +Cc: LKML, Thomas Gleixner, H. Peter Anvin * Li Zefan <lizf@cn.fujitsu.com> wrote: > +#ifdef CONFIG_SYSCTL > static int unknown_nmi_panic_callback(struct pt_regs *regs, int cpu); > +#endif instead of adding another #ifdef, a much cleaner solution would be to just reorder do_nmi_callback() with unknown_nmi_panic_callback(), and eliminate the prototype altogether. Ingo ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] x86: fix compile waring building without CONFIG_SYSCTL 2008-02-03 7:12 ` Ingo Molnar @ 2008-02-03 7:31 ` Li Zefan 2008-02-03 7:40 ` [PATCH] x86: fix compile warning " Li Zefan 0 siblings, 1 reply; 6+ messages in thread From: Li Zefan @ 2008-02-03 7:31 UTC (permalink / raw) To: Ingo Molnar; +Cc: LKML, Thomas Gleixner, H. Peter Anvin Ingo Molnar wrote: > * Li Zefan <lizf@cn.fujitsu.com> wrote: > >> +#ifdef CONFIG_SYSCTL >> static int unknown_nmi_panic_callback(struct pt_regs *regs, int cpu); >> +#endif > > instead of adding another #ifdef, a much cleaner solution would be to > just reorder do_nmi_callback() with unknown_nmi_panic_callback(), and > eliminate the prototype altogether. > > Ingo > I was wondering if a smaller patch will be better. But no doult cleaner code is better. :) ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] x86: fix compile warning building without CONFIG_SYSCTL 2008-02-03 7:31 ` Li Zefan @ 2008-02-03 7:40 ` Li Zefan 2008-02-15 20:21 ` Ingo Molnar 2008-02-17 13:56 ` Thomas Gleixner 0 siblings, 2 replies; 6+ messages in thread From: Li Zefan @ 2008-02-03 7:40 UTC (permalink / raw) To: Ingo Molnar; +Cc: LKML, Thomas Gleixner, H. Peter Anvin 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 | 21 +++++++++------------ arch/x86/kernel/nmi_64.c | 21 +++++++++------------ 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/arch/x86/kernel/nmi_32.c b/arch/x86/kernel/nmi_32.c index edd4136..6a0aa70 100644 --- a/arch/x86/kernel/nmi_32.c +++ b/arch/x86/kernel/nmi_32.c @@ -46,9 +46,6 @@ static unsigned int nmi_hz = HZ; static DEFINE_PER_CPU(short, wd_enabled); -/* local prototypes */ -static int unknown_nmi_panic_callback(struct pt_regs *regs, int cpu); - static int endflag __initdata = 0; #ifdef CONFIG_SMP @@ -391,15 +388,6 @@ __kprobes int nmi_watchdog_tick(struct pt_regs * regs, unsigned reason) return rc; } -int do_nmi_callback(struct pt_regs * regs, int cpu) -{ -#ifdef CONFIG_SYSCTL - if (unknown_nmi_panic) - return unknown_nmi_panic_callback(regs, cpu); -#endif - return 0; -} - #ifdef CONFIG_SYSCTL static int unknown_nmi_panic_callback(struct pt_regs *regs, int cpu) @@ -453,6 +441,15 @@ int proc_nmi_enabled(struct ctl_table *table, int write, struct file *file, #endif +int do_nmi_callback(struct pt_regs *regs, int cpu) +{ +#ifdef CONFIG_SYSCTL + if (unknown_nmi_panic) + return unknown_nmi_panic_callback(regs, cpu); +#endif + return 0; +} + void __trigger_all_cpu_backtrace(void) { int i; diff --git a/arch/x86/kernel/nmi_64.c b/arch/x86/kernel/nmi_64.c index fb99484..9a4fde7 100644 --- a/arch/x86/kernel/nmi_64.c +++ b/arch/x86/kernel/nmi_64.c @@ -46,9 +46,6 @@ static unsigned int nmi_hz = HZ; static DEFINE_PER_CPU(short, wd_enabled); -/* local prototypes */ -static int unknown_nmi_panic_callback(struct pt_regs *regs, int cpu); - /* Run after command line and cpu_init init, but before all other checks */ void nmi_watchdog_default(void) { @@ -394,15 +391,6 @@ asmlinkage __kprobes void do_nmi(struct pt_regs * regs, long error_code) nmi_exit(); } -int do_nmi_callback(struct pt_regs * regs, int cpu) -{ -#ifdef CONFIG_SYSCTL - if (unknown_nmi_panic) - return unknown_nmi_panic_callback(regs, cpu); -#endif - return 0; -} - void stop_nmi(void) { acpi_nmi_disable(); @@ -464,6 +452,15 @@ int proc_nmi_enabled(struct ctl_table *table, int write, struct file *file, #endif +int do_nmi_callback(struct pt_regs *regs, int cpu) +{ +#ifdef CONFIG_SYSCTL + if (unknown_nmi_panic) + return unknown_nmi_panic_callback(regs, cpu); +#endif + return 0; +} + void __trigger_all_cpu_backtrace(void) { int i; -- 1.5.4.rc3 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] x86: fix compile warning building without CONFIG_SYSCTL 2008-02-03 7:40 ` [PATCH] x86: fix compile warning " Li Zefan @ 2008-02-15 20:21 ` Ingo Molnar 2008-02-17 13:56 ` Thomas Gleixner 1 sibling, 0 replies; 6+ messages in thread From: Ingo Molnar @ 2008-02-15 20:21 UTC (permalink / raw) To: Li Zefan; +Cc: LKML, Thomas Gleixner, H. Peter Anvin * Li Zefan <lizf@cn.fujitsu.com> wrote: > 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 thanks, applied. Ingo ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] x86: fix compile warning building without CONFIG_SYSCTL 2008-02-03 7:40 ` [PATCH] x86: fix compile warning " Li Zefan 2008-02-15 20:21 ` Ingo Molnar @ 2008-02-17 13:56 ` Thomas Gleixner 1 sibling, 0 replies; 6+ messages in thread From: Thomas Gleixner @ 2008-02-17 13:56 UTC (permalink / raw) To: Li Zefan; +Cc: Ingo Molnar, LKML, H. Peter Anvin On Sun, 3 Feb 2008, Li Zefan wrote: > 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> Applied. Thanks, tglx > --- > arch/x86/kernel/nmi_32.c | 21 +++++++++------------ > arch/x86/kernel/nmi_64.c | 21 +++++++++------------ > 2 files changed, 18 insertions(+), 24 deletions(-) > > diff --git a/arch/x86/kernel/nmi_32.c b/arch/x86/kernel/nmi_32.c > index edd4136..6a0aa70 100644 > --- a/arch/x86/kernel/nmi_32.c > +++ b/arch/x86/kernel/nmi_32.c > @@ -46,9 +46,6 @@ static unsigned int nmi_hz = HZ; > > static DEFINE_PER_CPU(short, wd_enabled); > > -/* local prototypes */ > -static int unknown_nmi_panic_callback(struct pt_regs *regs, int cpu); > - > static int endflag __initdata = 0; > > #ifdef CONFIG_SMP > @@ -391,15 +388,6 @@ __kprobes int nmi_watchdog_tick(struct pt_regs * regs, unsigned reason) > return rc; > } > > -int do_nmi_callback(struct pt_regs * regs, int cpu) > -{ > -#ifdef CONFIG_SYSCTL > - if (unknown_nmi_panic) > - return unknown_nmi_panic_callback(regs, cpu); > -#endif > - return 0; > -} > - > #ifdef CONFIG_SYSCTL > > static int unknown_nmi_panic_callback(struct pt_regs *regs, int cpu) > @@ -453,6 +441,15 @@ int proc_nmi_enabled(struct ctl_table *table, int write, struct file *file, > > #endif > > +int do_nmi_callback(struct pt_regs *regs, int cpu) > +{ > +#ifdef CONFIG_SYSCTL > + if (unknown_nmi_panic) > + return unknown_nmi_panic_callback(regs, cpu); > +#endif > + return 0; > +} > + > void __trigger_all_cpu_backtrace(void) > { > int i; > diff --git a/arch/x86/kernel/nmi_64.c b/arch/x86/kernel/nmi_64.c > index fb99484..9a4fde7 100644 > --- a/arch/x86/kernel/nmi_64.c > +++ b/arch/x86/kernel/nmi_64.c > @@ -46,9 +46,6 @@ static unsigned int nmi_hz = HZ; > > static DEFINE_PER_CPU(short, wd_enabled); > > -/* local prototypes */ > -static int unknown_nmi_panic_callback(struct pt_regs *regs, int cpu); > - > /* Run after command line and cpu_init init, but before all other checks */ > void nmi_watchdog_default(void) > { > @@ -394,15 +391,6 @@ asmlinkage __kprobes void do_nmi(struct pt_regs * regs, long error_code) > nmi_exit(); > } > > -int do_nmi_callback(struct pt_regs * regs, int cpu) > -{ > -#ifdef CONFIG_SYSCTL > - if (unknown_nmi_panic) > - return unknown_nmi_panic_callback(regs, cpu); > -#endif > - return 0; > -} > - > void stop_nmi(void) > { > acpi_nmi_disable(); > @@ -464,6 +452,15 @@ int proc_nmi_enabled(struct ctl_table *table, int write, struct file *file, > > #endif > > +int do_nmi_callback(struct pt_regs *regs, int cpu) > +{ > +#ifdef CONFIG_SYSCTL > + if (unknown_nmi_panic) > + return unknown_nmi_panic_callback(regs, cpu); > +#endif > + return 0; > +} > + > void __trigger_all_cpu_backtrace(void) > { > int i; > -- > 1.5.4.rc3 > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ > ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-02-17 13:57 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2008-02-03 6:18 [PATCH] x86: fix compile waring building without CONFIG_SYSCTL Li Zefan 2008-02-03 7:12 ` Ingo Molnar 2008-02-03 7:31 ` Li Zefan 2008-02-03 7:40 ` [PATCH] x86: fix compile warning " Li Zefan 2008-02-15 20:21 ` Ingo Molnar 2008-02-17 13:56 ` Thomas Gleixner
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox