diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 09:52:48 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-25 09:52:48 -0500 |
| commit | f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544 (patch) | |
| tree | 4c7abed6047538c13dd024a8ecffd15f31b4609a /drivers/pci/pci-sysfs.c | |
| parent | 84549d239ab9bb2e3a85c6efcf0e6478a38b4260 (diff) | |
| parent | 40aa7030e5213a43e9e0554fd7f95534ea310bf3 (diff) | |
Merge branch 'for-2.6.33' into for-2.6.34
Diffstat (limited to 'drivers/pci/pci-sysfs.c')
| -rw-r--r-- | drivers/pci/pci-sysfs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index c5df94e8667..807224ec835 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c | |||
| @@ -75,7 +75,8 @@ static ssize_t local_cpus_show(struct device *dev, | |||
| 75 | int len; | 75 | int len; |
| 76 | 76 | ||
| 77 | #ifdef CONFIG_NUMA | 77 | #ifdef CONFIG_NUMA |
| 78 | mask = cpumask_of_node(dev_to_node(dev)); | 78 | mask = (dev_to_node(dev) == -1) ? cpu_online_mask : |
| 79 | cpumask_of_node(dev_to_node(dev)); | ||
| 79 | #else | 80 | #else |
| 80 | mask = cpumask_of_pcibus(to_pci_dev(dev)->bus); | 81 | mask = cpumask_of_pcibus(to_pci_dev(dev)->bus); |
| 81 | #endif | 82 | #endif |
| @@ -93,7 +94,8 @@ static ssize_t local_cpulist_show(struct device *dev, | |||
| 93 | int len; | 94 | int len; |
| 94 | 95 | ||
| 95 | #ifdef CONFIG_NUMA | 96 | #ifdef CONFIG_NUMA |
| 96 | mask = cpumask_of_node(dev_to_node(dev)); | 97 | mask = (dev_to_node(dev) == -1) ? cpu_online_mask : |
| 98 | cpumask_of_node(dev_to_node(dev)); | ||
| 97 | #else | 99 | #else |
| 98 | mask = cpumask_of_pcibus(to_pci_dev(dev)->bus); | 100 | mask = cpumask_of_pcibus(to_pci_dev(dev)->bus); |
| 99 | #endif | 101 | #endif |