aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/irq.h10
-rw-r--r--kernel/irq/handle.c4
2 files changed, 9 insertions, 5 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h
index 80713d6e8c8d..eac1273dc4e1 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -170,11 +170,15 @@ static inline void set_balance_irq_affinity(unsigned int irq, cpumask_t mask)
170extern int no_irq_affinity; 170extern int no_irq_affinity;
171extern int noirqdebug_setup(char *str); 171extern int noirqdebug_setup(char *str);
172 172
173extern fastcall irqreturn_t handle_IRQ_event(unsigned int irq, struct pt_regs *regs, 173extern irqreturn_t handle_IRQ_event(unsigned int irq, struct pt_regs *regs,
174 struct irqaction *action); 174 struct irqaction *action);
175/*
176 * Explicit fastcall, because i386 4KSTACKS calls it from assembly:
177 */
175extern fastcall unsigned int __do_IRQ(unsigned int irq, struct pt_regs *regs); 178extern fastcall unsigned int __do_IRQ(unsigned int irq, struct pt_regs *regs);
179
176extern void note_interrupt(unsigned int irq, irq_desc_t *desc, 180extern void note_interrupt(unsigned int irq, irq_desc_t *desc,
177 int action_ret, struct pt_regs *regs); 181 int action_ret, struct pt_regs *regs);
178extern int can_request_irq(unsigned int irq, unsigned long irqflags); 182extern int can_request_irq(unsigned int irq, unsigned long irqflags);
179 183
180extern void init_irq_proc(void); 184extern void init_irq_proc(void);
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index cc786aaf30d6..6b313ccf0edd 100644
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -79,8 +79,8 @@ irqreturn_t no_action(int cpl, void *dev_id, struct pt_regs *regs)
79/* 79/*
80 * Have got an event to handle: 80 * Have got an event to handle:
81 */ 81 */
82fastcall irqreturn_t handle_IRQ_event(unsigned int irq, struct pt_regs *regs, 82irqreturn_t handle_IRQ_event(unsigned int irq, struct pt_regs *regs,
83 struct irqaction *action) 83 struct irqaction *action)
84{ 84{
85 irqreturn_t ret, retval = IRQ_NONE; 85 irqreturn_t ret, retval = IRQ_NONE;
86 unsigned int status = 0; 86 unsigned int status = 0;