aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-07-21 18:29:12 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-22 14:44:00 -0400
commite9ed7e722e3f4cea07cf3c4bfe98c18180a17793 (patch)
treeb1372269f948f5dead789fece8539d7f4de58be0
parente6f194d8f6f50da6837af637b2fd839c34185f7a (diff)
take declarations of enable_irq() et.al. to linux/interrupt.h
Now that the last inlined instances are gone, all that is left to do is turning disable_irq_nosync on arm26 and m68k from defines to aliases and we are all set - we can make these externs in linux/interrupt.h uncoditional and kill remaining instances in asm/irq.h Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/arm26/kernel/armksyms.c2
-rw-r--r--arch/arm26/kernel/irq.c6
-rw-r--r--arch/m68k/kernel/ints.c4
-rw-r--r--include/asm-alpha/irq.h4
-rw-r--r--include/asm-arm26/irq.h5
-rw-r--r--include/asm-h8300/irq.h3
-rw-r--r--include/asm-ia64/irq.h3
-rw-r--r--include/asm-m68k/irq.h3
-rw-r--r--include/asm-sh64/irq.h4
-rw-r--r--include/asm-sparc/irq.h4
-rw-r--r--include/asm-v850/irq.h10
-rw-r--r--include/linux/interrupt.h2
12 files changed, 11 insertions, 39 deletions
diff --git a/arch/arm26/kernel/armksyms.c b/arch/arm26/kernel/armksyms.c
index f735d7e018e4..fe1e3ceed7cb 100644
--- a/arch/arm26/kernel/armksyms.c
+++ b/arch/arm26/kernel/armksyms.c
@@ -107,8 +107,6 @@ EXPORT_SYMBOL(__bug);
107#endif 107#endif
108EXPORT_SYMBOL(__bad_xchg); 108EXPORT_SYMBOL(__bad_xchg);
109EXPORT_SYMBOL(__readwrite_bug); 109EXPORT_SYMBOL(__readwrite_bug);
110EXPORT_SYMBOL(enable_irq);
111EXPORT_SYMBOL(disable_irq);
112EXPORT_SYMBOL(set_irq_type); 110EXPORT_SYMBOL(set_irq_type);
113EXPORT_SYMBOL(pm_idle); 111EXPORT_SYMBOL(pm_idle);
114EXPORT_SYMBOL(pm_power_off); 112EXPORT_SYMBOL(pm_power_off);
diff --git a/arch/arm26/kernel/irq.c b/arch/arm26/kernel/irq.c
index d53382c83bf9..2ffe695b062e 100644
--- a/arch/arm26/kernel/irq.c
+++ b/arch/arm26/kernel/irq.c
@@ -95,6 +95,11 @@ void disable_irq(unsigned int irq)
95 desc->enabled = 0; 95 desc->enabled = 0;
96 spin_unlock_irqrestore(&irq_controller_lock, flags); 96 spin_unlock_irqrestore(&irq_controller_lock, flags);
97} 97}
98EXPORT_SYMBOL(disable_irq);
99
100void disable_irq_nosync(unsigned int irq) __attribute__((alias("disable_irq")));
101
102EXPORT_SYMBOL(disable_irq_nosync);
98 103
99/** 104/**
100 * enable_irq - enable interrupt handling on an irq 105 * enable_irq - enable interrupt handling on an irq
@@ -131,6 +136,7 @@ void enable_irq(unsigned int irq)
131 } 136 }
132 spin_unlock_irqrestore(&irq_controller_lock, flags); 137 spin_unlock_irqrestore(&irq_controller_lock, flags);
133} 138}
139EXPORT_SYMBOL(enable_irq);
134 140
135int show_interrupts(struct seq_file *p, void *v) 141int show_interrupts(struct seq_file *p, void *v)
136{ 142{
diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c
index 60d4d75f5798..2b412454cb41 100644
--- a/arch/m68k/kernel/ints.c
+++ b/arch/m68k/kernel/ints.c
@@ -326,6 +326,10 @@ void disable_irq(unsigned int irq)
326 326
327EXPORT_SYMBOL(disable_irq); 327EXPORT_SYMBOL(disable_irq);
328 328
329void disable_irq_nosync(unsigned int irq) __attribute__((alias("disable_irq")));
330
331EXPORT_SYMBOL(disable_irq_nosync);
332
329int m68k_irq_startup(unsigned int irq) 333int m68k_irq_startup(unsigned int irq)
330{ 334{
331 if (irq <= IRQ_AUTO_7) 335 if (irq <= IRQ_AUTO_7)
diff --git a/include/asm-alpha/irq.h b/include/asm-alpha/irq.h
index 917b9fe372cf..06377400dc09 100644
--- a/include/asm-alpha/irq.h
+++ b/include/asm-alpha/irq.h
@@ -85,10 +85,6 @@ static __inline__ int irq_canonicalize(int irq)
85 return ((irq == 2) ? 9 : irq); 85 return ((irq == 2) ? 9 : irq);
86} 86}
87 87
88extern void disable_irq(unsigned int);
89extern void disable_irq_nosync(unsigned int);
90extern void enable_irq(unsigned int);
91
92struct pt_regs; 88struct pt_regs;
93extern void (*perf_irq)(unsigned long, struct pt_regs *); 89extern void (*perf_irq)(unsigned long, struct pt_regs *);
94 90
diff --git a/include/asm-arm26/irq.h b/include/asm-arm26/irq.h
index 9aaac87efba9..52971b49ed3b 100644
--- a/include/asm-arm26/irq.h
+++ b/include/asm-arm26/irq.h
@@ -24,11 +24,6 @@
24 24
25struct irqaction; 25struct irqaction;
26 26
27#define disable_irq_nosync(i) disable_irq(i)
28
29extern void disable_irq(unsigned int);
30extern void enable_irq(unsigned int);
31
32#define __IRQT_FALEDGE (1 << 0) 27#define __IRQT_FALEDGE (1 << 0)
33#define __IRQT_RISEDGE (1 << 1) 28#define __IRQT_RISEDGE (1 << 1)
34#define __IRQT_LOWLVL (1 << 2) 29#define __IRQT_LOWLVL (1 << 2)
diff --git a/include/asm-h8300/irq.h b/include/asm-h8300/irq.h
index 41be646c3514..56eec28cc2c4 100644
--- a/include/asm-h8300/irq.h
+++ b/include/asm-h8300/irq.h
@@ -59,7 +59,4 @@ static __inline__ int irq_canonicalize(int irq)
59 return irq; 59 return irq;
60} 60}
61 61
62extern void enable_irq(unsigned int);
63extern void disable_irq(unsigned int);
64
65#endif /* _H8300_IRQ_H_ */ 62#endif /* _H8300_IRQ_H_ */
diff --git a/include/asm-ia64/irq.h b/include/asm-ia64/irq.h
index 35b360b82e43..a66d26827cbb 100644
--- a/include/asm-ia64/irq.h
+++ b/include/asm-ia64/irq.h
@@ -33,9 +33,6 @@ irq_canonicalize (int irq)
33 return ((irq == 2) ? 9 : irq); 33 return ((irq == 2) ? 9 : irq);
34} 34}
35 35
36extern void disable_irq (unsigned int);
37extern void disable_irq_nosync (unsigned int);
38extern void enable_irq (unsigned int);
39extern void set_irq_affinity_info (unsigned int irq, int dest, int redir); 36extern void set_irq_affinity_info (unsigned int irq, int dest, int redir);
40bool is_affinity_mask_valid(cpumask_t cpumask); 37bool is_affinity_mask_valid(cpumask_t cpumask);
41 38
diff --git a/include/asm-m68k/irq.h b/include/asm-m68k/irq.h
index 4901cb105e2f..eb29a5260591 100644
--- a/include/asm-m68k/irq.h
+++ b/include/asm-m68k/irq.h
@@ -59,9 +59,6 @@
59#define IRQ_USER 8 59#define IRQ_USER 8
60 60
61extern unsigned int irq_canonicalize(unsigned int irq); 61extern unsigned int irq_canonicalize(unsigned int irq);
62extern void enable_irq(unsigned int);
63extern void disable_irq(unsigned int);
64#define disable_irq_nosync disable_irq
65 62
66struct pt_regs; 63struct pt_regs;
67 64
diff --git a/include/asm-sh64/irq.h b/include/asm-sh64/irq.h
index 1ca49e29288a..5c9e6a873aeb 100644
--- a/include/asm-sh64/irq.h
+++ b/include/asm-sh64/irq.h
@@ -114,10 +114,6 @@
114#define IRL0_PRIORITY 13 114#define IRL0_PRIORITY 13
115#define TOP_PRIORITY 15 115#define TOP_PRIORITY 15
116 116
117extern void disable_irq(unsigned int);
118extern void disable_irq_nosync(unsigned int);
119extern void enable_irq(unsigned int);
120
121extern int intc_evt_to_irq[(0xE20/0x20)+1]; 117extern int intc_evt_to_irq[(0xE20/0x20)+1];
122int intc_irq_describe(char* p, int irq); 118int intc_irq_describe(char* p, int irq);
123 119
diff --git a/include/asm-sparc/irq.h b/include/asm-sparc/irq.h
index afb88a5973f0..61fb99643afd 100644
--- a/include/asm-sparc/irq.h
+++ b/include/asm-sparc/irq.h
@@ -13,10 +13,6 @@
13 13
14#define irq_canonicalize(irq) (irq) 14#define irq_canonicalize(irq) (irq)
15 15
16extern void disable_irq_nosync(unsigned int irq);
17extern void disable_irq(unsigned int irq);
18extern void enable_irq(unsigned int irq);
19
20extern int request_fast_irq(unsigned int irq, irq_handler_t handler, unsigned long flags, __const__ char *devname); 16extern int request_fast_irq(unsigned int irq, irq_handler_t handler, unsigned long flags, __const__ char *devname);
21 17
22#endif 18#endif
diff --git a/include/asm-v850/irq.h b/include/asm-v850/irq.h
index 88687c181f01..7d0d4cd1ce54 100644
--- a/include/asm-v850/irq.h
+++ b/include/asm-v850/irq.h
@@ -50,16 +50,6 @@ init_irq_handlers (int base_irq, int num, int interval,
50 interrupt. */ 50 interrupt. */
51extern unsigned int handle_irq (int irq, struct pt_regs *regs); 51extern unsigned int handle_irq (int irq, struct pt_regs *regs);
52 52
53
54/* Enable interrupt handling on an irq. */
55extern void enable_irq(unsigned int irq);
56
57/* Disable an irq and wait for completion. */
58extern void disable_irq (unsigned int irq);
59
60/* Disable an irq without waiting. */
61extern void disable_irq_nosync (unsigned int irq);
62
63#endif /* !__ASSEMBLY__ */ 53#endif /* !__ASSEMBLY__ */
64 54
65#endif /* __V850_IRQ_H__ */ 55#endif /* __V850_IRQ_H__ */
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 5323f6275854..0a3c2ebf2008 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -120,11 +120,11 @@ extern void devm_free_irq(struct device *dev, unsigned int irq, void *dev_id);
120# define local_irq_enable_in_hardirq() local_irq_enable() 120# define local_irq_enable_in_hardirq() local_irq_enable()
121#endif 121#endif
122 122
123#ifdef CONFIG_GENERIC_HARDIRQS
124extern void disable_irq_nosync(unsigned int irq); 123extern void disable_irq_nosync(unsigned int irq);
125extern void disable_irq(unsigned int irq); 124extern void disable_irq(unsigned int irq);
126extern void enable_irq(unsigned int irq); 125extern void enable_irq(unsigned int irq);
127 126
127#ifdef CONFIG_GENERIC_HARDIRQS
128/* 128/*
129 * Special lockdep variants of irq disabling/enabling. 129 * Special lockdep variants of irq disabling/enabling.
130 * These should be used for locking constructs that 130 * These should be used for locking constructs that