summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-01-31 11:12:04 +0100
committerIngo Molnar <mingo@elte.hu>2011-01-31 11:12:04 +0100
commit4e70e1a1b8bf2425aaf3d25f6e65ce795d347723 (patch)
treefa0b01676c924cb9db3018cf6305c88eea0a3633
parent394629a569520681540f9757e1b71b13cbf6f7d3 (diff)
parent1fb0ef31f428f345a7c3666f8e7444a563edd537 (diff)
Merge branch 'irq/numa' into auto-latest
-rw-r--r--kernel/irq/manage.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 0587c5ceaed8..538fce2db51c 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -179,7 +179,7 @@ static void irq_affinity_notify(struct work_struct *work)
cpumask_copy(cpumask, desc->pending_mask);
else
#endif
- cpumask_copy(cpumask, desc->affinity);
+ cpumask_copy(cpumask, desc->irq_data.affinity);
raw_spin_unlock_irqrestore(&desc->lock, flags);
notify->notify(notify, cpumask);