diff options
| author | David Rientjes <rientjes@google.com> | 2009-09-18 12:41:10 +0200 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-09-18 17:51:10 +0200 |
| commit | 7715a1e887c5dedc9cf1e57a8f35df261c749b08 (patch) | |
| tree | bca8db5ca6e8f724387831ea6aa5b013a378c371 /arch/x86/include/asm/pci.h | |
| parent | MAINTAINTERS: remove hotplug driver entries (diff) | |
| download | linux-7715a1e887c5dedc9cf1e57a8f35df261c749b08.tar.xz linux-7715a1e887c5dedc9cf1e57a8f35df261c749b08.zip | |
x86/PCI: default pcibus cpumask to all cpus if it lacks affinity
The early initialization of the pci bus to node mapping leaves all busses
with a node id of -1 if it lacks memory affinity. Thus, cpumask_of_pcibus
must return all online cpus for such busses.
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'arch/x86/include/asm/pci.h')
| -rw-r--r-- | arch/x86/include/asm/pci.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index f76a162c082c..ada8c201d513 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -143,7 +143,11 @@ static inline int __pcibus_to_node(const struct pci_bus *bus) static inline const struct cpumask * cpumask_of_pcibus(const struct pci_bus *bus) { - return cpumask_of_node(__pcibus_to_node(bus)); + int node; + + node = __pcibus_to_node(bus); + return (node == -1) ? cpu_online_mask : + cpumask_of_node(node); } #endif |