diff options
Diffstat (limited to 'kernel/irq/handle.c')
-rw-r--r-- | kernel/irq/handle.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c index bdb180325551..131ca176b497 100644 --- a/kernel/irq/handle.c +++ b/kernel/irq/handle.c | |||
@@ -133,7 +133,7 @@ irqreturn_t | |||
133 | handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action) | 133 | handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action) |
134 | { | 134 | { |
135 | irqreturn_t retval = IRQ_NONE; | 135 | irqreturn_t retval = IRQ_NONE; |
136 | unsigned int random = 0, irq = desc->irq_data.irq; | 136 | unsigned int flags = 0, irq = desc->irq_data.irq; |
137 | 137 | ||
138 | do { | 138 | do { |
139 | irqreturn_t res; | 139 | irqreturn_t res; |
@@ -161,7 +161,7 @@ handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action) | |||
161 | 161 | ||
162 | /* Fall through to add to randomness */ | 162 | /* Fall through to add to randomness */ |
163 | case IRQ_HANDLED: | 163 | case IRQ_HANDLED: |
164 | random |= action->flags; | 164 | flags |= action->flags; |
165 | break; | 165 | break; |
166 | 166 | ||
167 | default: | 167 | default: |
@@ -172,8 +172,7 @@ handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action) | |||
172 | action = action->next; | 172 | action = action->next; |
173 | } while (action); | 173 | } while (action); |
174 | 174 | ||
175 | if (random & IRQF_SAMPLE_RANDOM) | 175 | add_interrupt_randomness(irq, flags); |
176 | add_interrupt_randomness(irq); | ||
177 | 176 | ||
178 | if (!noirqdebug) | 177 | if (!noirqdebug) |
179 | note_interrupt(irq, desc, retval); | 178 | note_interrupt(irq, desc, retval); |