Commit 6168a702 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

[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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a6e6df25

arch/h8300/kernel/ints.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/sched.h>

#include <linux/kernel_stat.h>

#include <linux/seq_file.h>

#include <linux/interrupt.h>

#include <linux/init.h>

#include <linux/random.h>

#include <linux/bootmem.h>

arch/h8300/platform/h8s/ints.c

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/kernel_stat.h>

#include <linux/seq_file.h>

#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/bootmem.h>

#include <linux/random.h>

#include <linux/hardirq.h>

arch/m68k/kernel/ints.c

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/module.h>

#include <linux/types.h>

#include <linux/sched.h>

#include <linux/interrupt.h>

#include <linux/kernel_stat.h>

#include <linux/errno.h>

#include <linux/init.h>

arch/m68knommu/platform/5307/ints.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/types.h>

#include <linux/init.h>

#include <linux/sched.h>

#include <linux/interrupt.h>

#include <linux/kernel_stat.h>

#include <linux/errno.h>

#include <linux/seq_file.h>

include/linux/interrupt.h

+9 −0
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE