Merge branch 'irq/numa' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

30df754d · David S. Miller · 9ecb42fd · 1fb0ef31 · 30df754d
Commit 30df754d authored Mar 15, 2011 by David S. Miller
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

kernel/irq/manage.c kernel/irq/manage.c +1 -1

No files found.
--- 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);