diff options
-rw-r--r-- | arch/arm26/kernel/armksyms.c | 2 | ||||
-rw-r--r-- | arch/arm26/kernel/irq.c | 6 | ||||
-rw-r--r-- | arch/m68k/kernel/ints.c | 4 | ||||
-rw-r--r-- | include/asm-alpha/irq.h | 4 | ||||
-rw-r--r-- | include/asm-arm26/irq.h | 5 | ||||
-rw-r--r-- | include/asm-h8300/irq.h | 3 | ||||
-rw-r--r-- | include/asm-ia64/irq.h | 3 | ||||
-rw-r--r-- | include/asm-m68k/irq.h | 3 | ||||
-rw-r--r-- | include/asm-sh64/irq.h | 4 | ||||
-rw-r--r-- | include/asm-sparc/irq.h | 4 | ||||
-rw-r--r-- | include/asm-v850/irq.h | 10 | ||||
-rw-r--r-- | include/linux/interrupt.h | 2 |
12 files changed, 11 insertions, 39 deletions
diff --git a/arch/arm26/kernel/armksyms.c b/arch/arm26/kernel/armksyms.c index f735d7e018e..fe1e3ceed7c 100644 --- a/arch/arm26/kernel/armksyms.c +++ b/arch/arm26/kernel/armksyms.c | |||
@@ -107,8 +107,6 @@ EXPORT_SYMBOL(__bug); | |||
107 | #endif | 107 | #endif |
108 | EXPORT_SYMBOL(__bad_xchg); | 108 | EXPORT_SYMBOL(__bad_xchg); |
109 | EXPORT_SYMBOL(__readwrite_bug); | 109 | EXPORT_SYMBOL(__readwrite_bug); |
110 | EXPORT_SYMBOL(enable_irq); | ||
111 | EXPORT_SYMBOL(disable_irq); | ||
112 | EXPORT_SYMBOL(set_irq_type); | 110 | EXPORT_SYMBOL(set_irq_type); |
113 | EXPORT_SYMBOL(pm_idle); | 111 | EXPORT_SYMBOL(pm_idle); |
114 | EXPORT_SYMBOL(pm_power_off); | 112 | EXPORT_SYMBOL(pm_power_off); |
diff --git a/arch/arm26/kernel/irq.c b/arch/arm26/kernel/irq.c index d53382c83bf..2ffe695b062 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 | } |
98 | EXPORT_SYMBOL(disable_irq); | ||
99 | |||
100 | void disable_irq_nosync(unsigned int irq) __attribute__((alias("disable_irq"))); | ||
101 | |||
102 | EXPORT_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 | } |
139 | EXPORT_SYMBOL(enable_irq); | ||
134 | 140 | ||
135 | int show_interrupts(struct seq_file *p, void *v) | 141 | int 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 60d4d75f579..2b412454cb4 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 | ||
327 | EXPORT_SYMBOL(disable_irq); | 327 | EXPORT_SYMBOL(disable_irq); |
328 | 328 | ||
329 | void disable_irq_nosync(unsigned int irq) __attribute__((alias("disable_irq"))); | ||
330 | |||
331 | EXPORT_SYMBOL(disable_irq_nosync); | ||
332 | |||
329 | int m68k_irq_startup(unsigned int irq) | 333 | int 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 917b9fe372c..06377400dc0 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 | ||
88 | extern void disable_irq(unsigned int); | ||
89 | extern void disable_irq_nosync(unsigned int); | ||
90 | extern void enable_irq(unsigned int); | ||
91 | |||
92 | struct pt_regs; | 88 | struct pt_regs; |
93 | extern void (*perf_irq)(unsigned long, struct pt_regs *); | 89 | extern 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 9aaac87efba..52971b49ed3 100644 --- a/include/asm-arm26/irq.h +++ b/include/asm-arm26/irq.h | |||
@@ -24,11 +24,6 @@ | |||
24 | 24 | ||
25 | struct irqaction; | 25 | struct irqaction; |
26 | 26 | ||
27 | #define disable_irq_nosync(i) disable_irq(i) | ||
28 | |||
29 | extern void disable_irq(unsigned int); | ||
30 | extern 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 41be646c351..56eec28cc2c 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 | ||
62 | extern void enable_irq(unsigned int); | ||
63 | extern 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 35b360b82e4..a66d26827cb 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 | ||
36 | extern void disable_irq (unsigned int); | ||
37 | extern void disable_irq_nosync (unsigned int); | ||
38 | extern void enable_irq (unsigned int); | ||
39 | extern void set_irq_affinity_info (unsigned int irq, int dest, int redir); | 36 | extern void set_irq_affinity_info (unsigned int irq, int dest, int redir); |
40 | bool is_affinity_mask_valid(cpumask_t cpumask); | 37 | bool is_affinity_mask_valid(cpumask_t cpumask); |
41 | 38 | ||
diff --git a/include/asm-m68k/irq.h b/include/asm-m68k/irq.h index 4901cb105e2..eb29a526059 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 | ||
61 | extern unsigned int irq_canonicalize(unsigned int irq); | 61 | extern unsigned int irq_canonicalize(unsigned int irq); |
62 | extern void enable_irq(unsigned int); | ||
63 | extern void disable_irq(unsigned int); | ||
64 | #define disable_irq_nosync disable_irq | ||
65 | 62 | ||
66 | struct pt_regs; | 63 | struct pt_regs; |
67 | 64 | ||
diff --git a/include/asm-sh64/irq.h b/include/asm-sh64/irq.h index 1ca49e29288..5c9e6a873ae 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 | ||
117 | extern void disable_irq(unsigned int); | ||
118 | extern void disable_irq_nosync(unsigned int); | ||
119 | extern void enable_irq(unsigned int); | ||
120 | |||
121 | extern int intc_evt_to_irq[(0xE20/0x20)+1]; | 117 | extern int intc_evt_to_irq[(0xE20/0x20)+1]; |
122 | int intc_irq_describe(char* p, int irq); | 118 | int intc_irq_describe(char* p, int irq); |
123 | 119 | ||
diff --git a/include/asm-sparc/irq.h b/include/asm-sparc/irq.h index afb88a5973f..61fb99643af 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 | ||
16 | extern void disable_irq_nosync(unsigned int irq); | ||
17 | extern void disable_irq(unsigned int irq); | ||
18 | extern void enable_irq(unsigned int irq); | ||
19 | |||
20 | extern int request_fast_irq(unsigned int irq, irq_handler_t handler, unsigned long flags, __const__ char *devname); | 16 | extern 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 88687c181f0..7d0d4cd1ce5 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. */ |
51 | extern unsigned int handle_irq (int irq, struct pt_regs *regs); | 51 | extern unsigned int handle_irq (int irq, struct pt_regs *regs); |
52 | 52 | ||
53 | |||
54 | /* Enable interrupt handling on an irq. */ | ||
55 | extern void enable_irq(unsigned int irq); | ||
56 | |||
57 | /* Disable an irq and wait for completion. */ | ||
58 | extern void disable_irq (unsigned int irq); | ||
59 | |||
60 | /* Disable an irq without waiting. */ | ||
61 | extern 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 5323f627585..0a3c2ebf200 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 | ||
124 | extern void disable_irq_nosync(unsigned int irq); | 123 | extern void disable_irq_nosync(unsigned int irq); |
125 | extern void disable_irq(unsigned int irq); | 124 | extern void disable_irq(unsigned int irq); |
126 | extern void enable_irq(unsigned int irq); | 125 | extern 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 |