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

diff --combined kernel/irq/manage.c
index 094fafe,538fce2..b0c9005
--- 1/kernel/irq/manage.c
--- 2/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@@ -179,7 -179,7 +179,7 @@@ static void irq_affinity_notify(struct 
                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);
@@@ -1182,7 -1182,7 +1182,7 @@@ int request_threaded_irq(unsigned int i
        if (retval)
                kfree(action);
  
 -#ifdef CONFIG_DEBUG_SHIRQ
 +#ifdef CONFIG_DEBUG_SHIRQ_FIXME
        if (!retval && (irqflags & IRQF_SHARED)) {
                /*
                 * It's a shared IRQ -- the driver ought to be prepared for it