summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-03-15 15:06:35 -0700
committerDavid S. Miller <davem@davemloft.net>2011-03-15 15:06:35 -0700
commit30df754dedebf27ef90452944a723ba058d23396 (patch)
tree80685c0377dec0980b31cdecf52114747224da3f
parent9ecb42fda614c4e4f46e95712621510f8d746980 (diff)
parent1fb0ef31f428f345a7c3666f8e7444a563edd537 (diff)
downloadop-kernel-dev-30df754dedebf27ef90452944a723ba058d23396.zip
op-kernel-dev-30df754dedebf27ef90452944a723ba058d23396.tar.gz
Merge branch 'irq/numa' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
-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 094fafe..b0c9005 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);
OpenPOWER on IntegriCloud