diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2009-03-31 13:33:50 +1030 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2009-03-31 13:33:50 +1030 |
| commit | 558f6ab9106e6be701acb0257e7171df1bbccf04 (patch) | |
| tree | 6e811633baeb676693c493f6c82bf785cab2771d /drivers/pci/pci-driver.c | |
| parent | 15f7176eb1cccec0a332541285ee752b935c1c85 (diff) | |
| parent | 65fb0d23fcddd8697c871047b700c78817bdaa43 (diff) | |
Merge branch 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
Conflicts:
arch/x86/include/asm/topology.h
drivers/oprofile/buffer_sync.c
(Both cases: changed in Linus' tree, removed in Ingo's).
Diffstat (limited to 'drivers/pci/pci-driver.c')
| -rw-r--r-- | drivers/pci/pci-driver.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 267de88551c..16240390bcd 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 |