diff options
| author | James Bottomley <James.Bottomley@suse.de> | 2011-02-10 11:20:53 -0600 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2011-02-10 11:20:53 -0600 |
| commit | 2c250ad23d438fa56e1beded374e44dc565c6c47 (patch) | |
| tree | 8f7e115c81c066134e48e998cb9b7380ff43f21c /arch/parisc/kernel | |
| parent | e9a623be5c984a1e344b2bb94e36e592f2491de6 (diff) | |
| parent | 9804c9eaeacfe78651052c5ddff31099f60ef78c (diff) | |
Merge branch 'fixes' into for-next
Diffstat (limited to 'arch/parisc/kernel')
| -rw-r--r-- | arch/parisc/kernel/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c index d7d94b845dc..3948f1dd455 100644 --- a/arch/parisc/kernel/irq.c +++ b/arch/parisc/kernel/irq.c @@ -108,7 +108,7 @@ int cpu_check_affinity(unsigned int irq, const struct cpumask *dest) int cpu_dest; /* timer and ipi have to always be received on all CPUs */ - if (CHECK_IRQ_PER_CPU(irq)) { + if (CHECK_IRQ_PER_CPU(irq_to_desc(irq)->status)) { /* Bad linux design decision. The mask has already * been set; we must reset it */ cpumask_setall(irq_desc[irq].affinity); |