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

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 094fafe86c964d062781fb82dd596b53984ddac7..b0c9005205171db8e26ae53b5884af485c3648d3 100644 (file)
--- 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);