Merge branch 'cpus4096' into irq/threaded

Conflicts:
	arch/parisc/kernel/irq.c
	kernel/irq/handle.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 93eac142358..b522f883d67 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -212,10 +212,9 @@ static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev,
         node = dev_to_node(&dev->dev);
         if (node >= 0) {
                 int cpu;
-                node_to_cpumask_ptr(nodecpumask, node);
 
                 get_online_cpus();
-                cpu = cpumask_any_and(nodecpumask, cpu_online_mask);
+                cpu = cpumask_any_and(cpumask_of_node(node), cpu_online_mask);
                 if (cpu < nr_cpu_ids)
                         error = work_on_cpu(cpu, local_pci_probe, &ddi);
                 else