diff options
| author | Andrew Morton <akpm@osdl.org> | 2007-02-17 21:22:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 14:21:50 -0800 |
| commit | 6168a702ab0be181e5e57a0b2d0e7376f7a47f0b (patch) | |
| tree | 4eaecb660154bb36b3884b21bf335ff040559902 /include | |
| parent | a6e6df25ec6751f4f73784398ab7d43cf9d2019f (diff) | |
| download | op-kernel-dev-6168a702ab0be181e5e57a0b2d0e7376f7a47f0b.zip op-kernel-dev-6168a702ab0be181e5e57a0b2d0e7376f7a47f0b.tar.gz | |
[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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/interrupt.h | 9 | ||||
| -rw-r--r-- | include/linux/irq.h | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index e5ea141..838cf5a 100644 --- a/include/linux/interrupt.h +++ b/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 */ #endif +#ifdef CONFIG_PROC_FS +/* Initialize /proc/irq/ */ +extern void init_irq_proc(void); +#else +static inline void init_irq_proc(void) +{ +} +#endif + #endif diff --git a/include/linux/irq.h b/include/linux/irq.h index 1939d42..aa5b3e61 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h @@ -328,9 +328,6 @@ extern void note_interrupt(unsigned int irq, struct irq_desc *desc, /* Resending of interrupts :*/ 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: */ extern int noirqdebug_setup(char *str); |
