Explorar o código

[PATCH] Declare init_irq_proc before we use it.

powerpc gets:

init/main.c: In function `do_basic_setup':
init/main.c:714: warning: implicit declaration of function `init_irq_proc'

but we cannot include linux/irq.h in generic code.

Fix it by moving the declaration into linux/interrupt.h instead.

And make sure all code that defines init_irq_proc() is including
linux/interrupt.h.

And nuke an ifdef-in-C

Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Andrew Morton %!s(int64=18) %!d(string=hai) anos
pai
achega
6168a702ab

+ 1 - 0
arch/h8300/kernel/ints.c

@@ -19,6 +19,7 @@
 #include <linux/sched.h>
 #include <linux/sched.h>
 #include <linux/kernel_stat.h>
 #include <linux/kernel_stat.h>
 #include <linux/seq_file.h>
 #include <linux/seq_file.h>
+#include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/init.h>
 #include <linux/random.h>
 #include <linux/random.h>
 #include <linux/bootmem.h>
 #include <linux/bootmem.h>

+ 1 - 0
arch/h8300/platform/h8s/ints.c

@@ -20,6 +20,7 @@
 #include <linux/kernel_stat.h>
 #include <linux/kernel_stat.h>
 #include <linux/seq_file.h>
 #include <linux/seq_file.h>
 #include <linux/init.h>
 #include <linux/init.h>
+#include <linux/interrupt.h>
 #include <linux/bootmem.h>
 #include <linux/bootmem.h>
 #include <linux/random.h>
 #include <linux/random.h>
 #include <linux/hardirq.h>
 #include <linux/hardirq.h>

+ 1 - 0
arch/m68k/kernel/ints.c

@@ -28,6 +28,7 @@
 #include <linux/module.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/types.h>
 #include <linux/sched.h>
 #include <linux/sched.h>
+#include <linux/interrupt.h>
 #include <linux/kernel_stat.h>
 #include <linux/kernel_stat.h>
 #include <linux/errno.h>
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/init.h>

+ 1 - 0
arch/m68knommu/platform/5307/ints.c

@@ -19,6 +19,7 @@
 #include <linux/types.h>
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/sched.h>
+#include <linux/interrupt.h>
 #include <linux/kernel_stat.h>
 #include <linux/kernel_stat.h>
 #include <linux/errno.h>
 #include <linux/errno.h>
 #include <linux/seq_file.h>
 #include <linux/seq_file.h>

+ 9 - 0
include/linux/interrupt.h

@@ -423,4 +423,13 @@ extern int probe_irq_off(unsigned long);	/* returns 0 or negative on failure */
 extern unsigned int probe_irq_mask(unsigned long);	/* returns mask of ISA interrupts */
 extern unsigned int probe_irq_mask(unsigned long);	/* returns mask of ISA interrupts */
 #endif
 #endif
 
 
+#ifdef CONFIG_PROC_FS
+/* Initialize /proc/irq/ */
+extern void init_irq_proc(void);
+#else
+static inline void init_irq_proc(void)
+{
+}
+#endif
+
 #endif
 #endif

+ 0 - 3
include/linux/irq.h

@@ -328,9 +328,6 @@ extern void note_interrupt(unsigned int irq, struct irq_desc *desc,
 /* Resending of interrupts :*/
 /* Resending of interrupts :*/
 void check_irq_resend(struct irq_desc *desc, unsigned int irq);
 void check_irq_resend(struct irq_desc *desc, unsigned int irq);
 
 
-/* Initialize /proc/irq/ */
-extern void init_irq_proc(void);
-
 /* Enable/disable irq debugging output: */
 /* Enable/disable irq debugging output: */
 extern int noirqdebug_setup(char *str);
 extern int noirqdebug_setup(char *str);
 
 

+ 1 - 4
init/main.c

@@ -41,6 +41,7 @@
 #include <linux/cpuset.h>
 #include <linux/cpuset.h>
 #include <linux/efi.h>
 #include <linux/efi.h>
 #include <linux/tick.h>
 #include <linux/tick.h>
+#include <linux/interrupt.h>
 #include <linux/taskstats_kern.h>
 #include <linux/taskstats_kern.h>
 #include <linux/delayacct.h>
 #include <linux/delayacct.h>
 #include <linux/unistd.h>
 #include <linux/unistd.h>
@@ -702,11 +703,7 @@ static void __init do_basic_setup(void)
 	init_workqueues();
 	init_workqueues();
 	usermodehelper_init();
 	usermodehelper_init();
 	driver_init();
 	driver_init();
-
-#ifdef CONFIG_PROC_FS
 	init_irq_proc();
 	init_irq_proc();
-#endif
-
 	do_initcalls();
 	do_initcalls();
 }
 }