Home » Mailing list archives » linux-kernel » 2007 » September » 21

Re: [PATCH] [12/45] i386: Fix arch/i386/kernel/nmi.c - 'unknown_nmi_panic_callback' declared 'static' but never defined warning

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Dave Jones <davej@...>
To: Andi Kleen <ak@...>
Cc: <patches@...>, <linux-kernel@...>
Subject: Re: [PATCH] [12/45] i386: Fix arch/i386/kernel/nmi.c - 'unknown_nmi_panic_callback' declared 'static' but never defined warning
Date: Friday, September 21, 2007 - 5:08 pm

On Fri, Sep 21, 2007 at 10:44:53PM +0200, Andi Kleen wrote:
 > 
 > I get this warning when CONFIG_SYSCTL is not set :
 > 
 > ...
 > 
 > arch/i386/kernel/nmi.c:52: warning: 'unknown_nmi_panic_callback' declared 'static' but never defined

If you move the function call after the declaration, you can do without
both the prototype, and the ifdef.

Signed-off-by: Dave Jones <davej@redhat.com>

diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c
index c7227e2..9a8ff0b 100644
--- a/arch/i386/kernel/nmi.c
+++ b/arch/i386/kernel/nmi.c
@@ -48,9 +48,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
@@ -389,15 +386,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)
@@ -451,6 +439,16 @@ 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;

-- 
http://www.codemonkey.org.uk
-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH] [0/45] x86 2.6.24 patches review I, Andi Kleen, (Fri Sep 21, 4:44 pm)
[PATCH] [45/45] i386: simplify smp_call_function_single() ca..., Andi Kleen, (Fri Sep 21, 4:45 pm)
[PATCH] [44/45] i386: simplify smp_call_function_single() ca..., Andi Kleen, (Fri Sep 21, 4:45 pm)
[PATCH] [43/45] i386: Clean up duplicate includes in arch/i3..., Andi Kleen, (Fri Sep 21, 4:45 pm)
[PATCH] [42/45] x86_64: use descriptor's functions instead o..., Andi Kleen, (Fri Sep 21, 4:45 pm)
[PATCH] [41/45] i386: remove unnecessary code, Andi Kleen, (Fri Sep 21, 4:45 pm)
[PATCH] [40/45] i386: deactivate the test for the dead CONFI..., Andi Kleen, (Fri Sep 21, 4:45 pm)
[PATCH] [39/45] x86_64: block irq balancing for timer, Andi Kleen, (Fri Sep 21, 4:45 pm)
[PATCH] [38/45] i386: setup_trampoline() must be __cpuinit, Andi Kleen, (Fri Sep 21, 4:45 pm)
[PATCH] [37/45] i386: remove -maccumulate-outgoing-args, Andi Kleen, (Fri Sep 21, 4:45 pm)
[PATCH] [36/45] x86_64: kmalloc + memset conversion to kzalloc, Andi Kleen, (Fri Sep 21, 4:45 pm)
[PATCH] [35/45] i386: make some variables static, Andi Kleen, (Fri Sep 21, 4:45 pm)
[PATCH] [34/45] i386: no need to make enable_cpu_hotplug a v..., Andi Kleen, (Fri Sep 21, 4:45 pm)
[PATCH] [33/45] i386: es7000 minor cleanups, Andi Kleen, (Fri Sep 21, 4:45 pm)
[PATCH] [32/45] x86_64: hide cond_syscall behind __KERNEL__, Andi Kleen, (Fri Sep 21, 4:45 pm)
Re: [PATCH] [32/45] x86_64: hide cond_syscall behind __KERNE..., Christoph Hellwig, (Sat Sep 22, 5:30 am)
[PATCH] [31/45] i386: make struct apic_probe static, Andi Kleen, (Fri Sep 21, 4:45 pm)
[PATCH] [30/45] i386: Remove local CPU logic in MTRR call to..., Andi Kleen, (Fri Sep 21, 4:45 pm)
[PATCH] [29/45] i386: Consolidate show_regs and show_registe..., Andi Kleen, (Fri Sep 21, 4:45 pm)
[PATCH] [28/45] x86_64: clean up apicid_to_node declaration, Andi Kleen, (Fri Sep 21, 4:45 pm)
[PATCH] [27/45] x86_64: convert mm_context_t semaphore to a ..., Andi Kleen, (Fri Sep 21, 4:45 pm)
[PATCH] [26/45] x86_64: clear IO_APIC before enabing apic er..., Andi Kleen, (Fri Sep 21, 4:45 pm)
[PATCH] [25/45] x86_64: remove sync_Arb_IDs, Andi Kleen, (Fri Sep 21, 4:45 pm)
[PATCH] [24/45] x86: Introduce frame_pointer() and stack_poi..., Andi Kleen, (Fri Sep 21, 4:45 pm)
Re: [PATCH] [24/45] x86: Introduce frame_pointer() and stack..., Christoph Hellwig, (Sat Sep 22, 5:26 am)
Re: [PATCH] [24/45] x86: Introduce frame_pointer() and stack..., Andi Kleen, (Mon Oct 1, 12:48 pm)
[PATCH] [23/45] i386: Make callgraph use dump_trace() on i38..., Andi Kleen, (Fri Sep 21, 4:45 pm)
[PATCH] [22/45] x86_64: Enable iommu_merge by default, Andi Kleen, (Fri Sep 21, 4:45 pm)
[PATCH] [21/45] x86_64: Some cleanups for pci gart code, Andi Kleen, (Fri Sep 21, 4:45 pm)
[PATCH] [20/45] x86_64: Use 8 byte stack alignment when poss..., Andi Kleen, (Fri Sep 21, 4:45 pm)
Re: [PATCH] [20/45] x86_64: Use 8 byte stack alignment when ..., Jakub Jelinek, (Fri Sep 21, 5:19 pm)
Re: [PATCH] [20/45] x86_64: Use 8 byte stack alignment when ..., Andi Kleen, (Sun Sep 30, 6:07 pm)
Re: [PATCH] [20/45] x86_64: Use 8 byte stack alignment when ..., Dave Jones, (Fri Sep 21, 5:13 pm)
Re: [PATCH] [20/45] x86_64: Use 8 byte stack alignment when ..., Andi Kleen, (Fri Sep 21, 6:34 pm)
Re: [PATCH] [20/45] x86_64: Use 8 byte stack alignment when ..., Dave Jones, (Fri Sep 21, 6:52 pm)
[PATCH] [19/45] x86_64: Always accumulate compiler options i..., Andi Kleen, (Fri Sep 21, 4:45 pm)
[PATCH] [18/45] x86_64: 0 -&gt; NULL, for arch/x86_64, Andi Kleen, (Fri Sep 21, 4:44 pm)
[PATCH] [17/45] i386: make Oprofile call shutdown() only onc..., Andi Kleen, (Fri Sep 21, 4:44 pm)
[PATCH] [16/45] i386: do not BUG_ON() when MSR is unknown, Andi Kleen, (Fri Sep 21, 4:44 pm)
[PATCH] [15/45] i386: i386 add AMD64 Barcelona PMU MSR defin..., Andi Kleen, (Fri Sep 21, 4:44 pm)
[PATCH] [14/45] x86: Create clflush() inline, remove hardcod..., Andi Kleen, (Fri Sep 21, 4:44 pm)
[PATCH] [13/45] x86_64: Increase VDSO_TEXT_OFFSET for ancien..., Andi Kleen, (Fri Sep 21, 4:44 pm)
Re: [PATCH] [13/45] x86_64: Increase VDSO_TEXT_OFFSET for an..., CaT, (Tue Nov 13, 8:21 pm)
Re: [PATCH] [13/45] x86_64: Increase VDSO_TEXT_OFFSET for an..., Andi Kleen, (Tue Nov 13, 8:25 pm)
[PATCH] [12/45] i386: Fix arch/i386/kernel/nmi.c - 'unknown_..., Andi Kleen, (Fri Sep 21, 4:44 pm)
Re: [PATCH] [12/45] i386: Fix arch/i386/kernel/nmi.c - 'unkn..., Dave Jones, (Fri Sep 21, 5:08 pm)
[PATCH] [11/45] x86_64: Remove rogue default m in drivers/vi..., Andi Kleen, (Fri Sep 21, 4:44 pm)
Re: [PATCH] [11/45] x86_64: Remove rogue default m in driver..., Len Brown, (Fri Sep 21, 11:15 pm)
[PATCH] [10/45] x86_64: x86_64 Sanitize user specified e820 ..., Andi Kleen, (Fri Sep 21, 4:44 pm)
[PATCH] [9/45] i386: Clean up duplicate includes in arch/i38..., Andi Kleen, (Fri Sep 21, 4:44 pm)
[PATCH] [8/45] x86_64: Use string instruction memcpy on AMD ..., Andi Kleen, (Fri Sep 21, 4:44 pm)
Re: [PATCH] [8/45] x86_64: Use string instruction memcpy on ..., Jan Engelhardt, (Sat Sep 22, 5:29 am)
[PATCH] [7/45] x86_64: Replace nvidia timer override quirk w..., Andi Kleen, (Fri Sep 21, 4:44 pm)
[PATCH] [6/45] x86: Unify i386 and x86-64 early quirks, Andi Kleen, (Fri Sep 21, 4:44 pm)
[PATCH] [5/45] x86_64: Use new shared sched_clock in x86-64 ..., Andi Kleen, (Fri Sep 21, 4:44 pm)
[PATCH] [4/45] i386: Rewrite sched_clock, Andi Kleen, (Fri Sep 21, 4:44 pm)
[PATCH] [3/45] x86: Separate checking of unsynchronized and ..., Andi Kleen, (Fri Sep 21, 4:44 pm)
[PATCH] [2/45] x86: constify stacktrace_ops, Andi Kleen, (Fri Sep 21, 4:44 pm)
[PATCH] [1/45] x86: misc. constifications, Andi Kleen, (Fri Sep 21, 4:44 pm)