diff options
-rw-r--r-- | kernel/irq/handle.c | 47 | ||||
-rw-r--r-- | kernel/irq/internals.h | 3 |
2 files changed, 42 insertions, 8 deletions
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c index cdd6fbbe771c..4ef059478ebf 100644 --- a/kernel/irq/handle.c +++ b/kernel/irq/handle.c | |||
@@ -51,14 +51,7 @@ static void warn_no_thread(unsigned int irq, struct irqaction *action) | |||
51 | "but no thread function available.", irq, action->name); | 51 | "but no thread function available.", irq, action->name); |
52 | } | 52 | } |
53 | 53 | ||
54 | /** | 54 | static irqreturn_t __handle_irq_event(unsigned int irq, struct irqaction *action) |
55 | * handle_IRQ_event - irq action chain handler | ||
56 | * @irq: the interrupt number | ||
57 | * @action: the interrupt action chain for this irq | ||
58 | * | ||
59 | * Handles the action chain of an irq event | ||
60 | */ | ||
61 | irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action) | ||
62 | { | 55 | { |
63 | irqreturn_t ret, retval = IRQ_NONE; | 56 | irqreturn_t ret, retval = IRQ_NONE; |
64 | unsigned int status = 0; | 57 | unsigned int status = 0; |
@@ -120,3 +113,41 @@ irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action) | |||
120 | 113 | ||
121 | return retval; | 114 | return retval; |
122 | } | 115 | } |
116 | |||
117 | irqreturn_t | ||
118 | handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action) | ||
119 | { | ||
120 | irqreturn_t ret = __handle_irq_event(desc->irq_data.irq, action); | ||
121 | |||
122 | if (!noirqdebug) | ||
123 | note_interrupt(desc->irq_data.irq, desc, ret); | ||
124 | return ret; | ||
125 | } | ||
126 | |||
127 | irqreturn_t handle_irq_event(struct irq_desc *desc) | ||
128 | { | ||
129 | struct irqaction *action = desc->action; | ||
130 | irqreturn_t ret; | ||
131 | |||
132 | desc->status &= ~IRQ_PENDING; | ||
133 | desc->status |= IRQ_INPROGRESS; | ||
134 | raw_spin_unlock(&desc->lock); | ||
135 | |||
136 | ret = handle_irq_event_percpu(desc, action); | ||
137 | |||
138 | raw_spin_lock(&desc->lock); | ||
139 | desc->status &= ~IRQ_INPROGRESS; | ||
140 | return ret; | ||
141 | } | ||
142 | |||
143 | /** | ||
144 | * handle_IRQ_event - irq action chain handler | ||
145 | * @irq: the interrupt number | ||
146 | * @action: the interrupt action chain for this irq | ||
147 | * | ||
148 | * Handles the action chain of an irq event | ||
149 | */ | ||
150 | irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action) | ||
151 | { | ||
152 | return __handle_irq_event(irq, action); | ||
153 | } | ||
diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h index c71fc4de0371..b61824cdadc6 100644 --- a/kernel/irq/internals.h +++ b/kernel/irq/internals.h | |||
@@ -45,6 +45,9 @@ extern void irq_disable(struct irq_desc *desc); | |||
45 | 45 | ||
46 | extern void init_kstat_irqs(struct irq_desc *desc, int node, int nr); | 46 | extern void init_kstat_irqs(struct irq_desc *desc, int node, int nr); |
47 | 47 | ||
48 | irqreturn_t handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action); | ||
49 | irqreturn_t handle_irq_event(struct irq_desc *desc); | ||
50 | |||
48 | /* Resending of interrupts :*/ | 51 | /* Resending of interrupts :*/ |
49 | void check_irq_resend(struct irq_desc *desc, unsigned int irq); | 52 | void check_irq_resend(struct irq_desc *desc, unsigned int irq); |
50 | bool irq_wait_for_poll(struct irq_desc *desc); | 53 | bool irq_wait_for_poll(struct irq_desc *desc); |