Merge branch 'irq/numa' of git://git.kernel.org/pub/scm/linux/kernel/…

…git/tip/linux-2.6-tip
git-mirror · Mar 15, 2011 · 30df754 · 30df754
2 parents 9ecb42f + 1fb0ef3
commit 30df754
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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);