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

This commit is contained in:
David S. Miller 2011-03-15 15:06:35 -07:00
commit 30df754ded

View file

@ -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);