diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-09 08:54:49 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-19 06:58:21 -0500 |
commit | f9e4989eb8183a1f33581fa1b99274287b0639d2 (patch) | |
tree | 3b69372623761448a044a24627ceba973e25c4f1 /kernel/irq/handle.c | |
parent | 1ccb4e612f68ceefb888c2c6c1def6294ea8666d (diff) |
genirq: Force wrapped access to desc->status in core code
Force the usage of wrappers by another nasty CPP substitution.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/irq/handle.c')
-rw-r--r-- | kernel/irq/handle.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c index 6e34bdbeb26a..cb62e2d0df4e 100644 --- a/kernel/irq/handle.c +++ b/kernel/irq/handle.c | |||
@@ -55,7 +55,7 @@ irqreturn_t | |||
55 | handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action) | 55 | handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action) |
56 | { | 56 | { |
57 | irqreturn_t ret, retval = IRQ_NONE; | 57 | irqreturn_t ret, retval = IRQ_NONE; |
58 | unsigned int status = 0, irq = desc->irq_data.irq; | 58 | unsigned int random = 0, irq = desc->irq_data.irq; |
59 | 59 | ||
60 | do { | 60 | do { |
61 | trace_irq_handler_entry(irq, action); | 61 | trace_irq_handler_entry(irq, action); |
@@ -98,7 +98,7 @@ handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action) | |||
98 | 98 | ||
99 | /* Fall through to add to randomness */ | 99 | /* Fall through to add to randomness */ |
100 | case IRQ_HANDLED: | 100 | case IRQ_HANDLED: |
101 | status |= action->flags; | 101 | random |= action->flags; |
102 | break; | 102 | break; |
103 | 103 | ||
104 | default: | 104 | default: |
@@ -109,7 +109,7 @@ handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action) | |||
109 | action = action->next; | 109 | action = action->next; |
110 | } while (action); | 110 | } while (action); |
111 | 111 | ||
112 | if (status & IRQF_SAMPLE_RANDOM) | 112 | if (random & IRQF_SAMPLE_RANDOM) |
113 | add_interrupt_randomness(irq); | 113 | add_interrupt_randomness(irq); |
114 | 114 | ||
115 | if (!noirqdebug) | 115 | if (!noirqdebug) |