aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorYinghai Lu <Yinghai.Lu@Sun.COM>2008-02-19 06:20:41 -0500
committerIngo Molnar <mingo@elte.hu>2008-04-26 17:41:04 -0400
commit0d358f22f6c8f03ab215eee8d52b74f78cc3c7db (patch)
treea60a05c5b5a2727ef6e82b273aafe2121373d93d /drivers/pci
parentd39398a333ddc490f842ccdd4b76c9674682aa5d (diff)
driver core: try parent numa_node at first before using default
in the device_add, we try to use use parent numa_node. need to make sure pci root bus's bridge device numa_node is set. then we could use device->numa_node direclty for all device. and don't need to call pcibus_to_node(). Signed-off-by: Yinghai Lu <yinghai.lu@sun.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/probe.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index a8efdaef1870..a40043bd3257 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -973,7 +973,6 @@ void pci_device_add(struct pci_dev *dev, struct pci_bus *bus)
973 dev->dev.release = pci_release_dev; 973 dev->dev.release = pci_release_dev;
974 pci_dev_get(dev); 974 pci_dev_get(dev);
975 975
976 set_dev_node(&dev->dev, pcibus_to_node(bus));
977 dev->dev.dma_mask = &dev->dma_mask; 976 dev->dev.dma_mask = &dev->dma_mask;
978 dev->dev.dma_parms = &dev->dma_parms; 977 dev->dev.dma_parms = &dev->dma_parms;
979 dev->dev.coherent_dma_mask = 0xffffffffull; 978 dev->dev.coherent_dma_mask = 0xffffffffull;
@@ -1128,6 +1127,9 @@ struct pci_bus * pci_create_bus(struct device *parent,
1128 goto dev_reg_err; 1127 goto dev_reg_err;
1129 b->bridge = get_device(dev); 1128 b->bridge = get_device(dev);
1130 1129
1130 if (!parent)
1131 set_dev_node(b->bridge, pcibus_to_node(b));
1132
1131 b->dev.class = &pcibus_class; 1133 b->dev.class = &pcibus_class;
1132 b->dev.parent = b->bridge; 1134 b->dev.parent = b->bridge;
1133 sprintf(b->dev.bus_id, "%04x:%02x", pci_domain_nr(b), bus); 1135 sprintf(b->dev.bus_id, "%04x:%02x", pci_domain_nr(b), bus);