aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
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/base
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/base')
-rw-r--r--drivers/base/core.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 9248e0927d08..be288b5e4180 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -787,6 +787,10 @@ int device_add(struct device *dev)
787 parent = get_device(dev->parent); 787 parent = get_device(dev->parent);
788 setup_parent(dev, parent); 788 setup_parent(dev, parent);
789 789
790 /* use parent numa_node */
791 if (parent)
792 set_dev_node(dev, dev_to_node(parent));
793
790 /* first, register with generic layer. */ 794 /* first, register with generic layer. */
791 error = kobject_add(&dev->kobj, dev->kobj.parent, "%s", dev->bus_id); 795 error = kobject_add(&dev->kobj, dev->kobj.parent, "%s", dev->bus_id);
792 if (error) 796 if (error)
@@ -1306,8 +1310,11 @@ int device_move(struct device *dev, struct device *new_parent)
1306 dev->parent = new_parent; 1310 dev->parent = new_parent;
1307 if (old_parent) 1311 if (old_parent)
1308 klist_remove(&dev->knode_parent); 1312 klist_remove(&dev->knode_parent);
1309 if (new_parent) 1313 if (new_parent) {
1310 klist_add_tail(&dev->knode_parent, &new_parent->klist_children); 1314 klist_add_tail(&dev->knode_parent, &new_parent->klist_children);
1315 set_dev_node(dev, dev_to_node(new_parent));
1316 }
1317
1311 if (!dev->class) 1318 if (!dev->class)
1312 goto out_put; 1319 goto out_put;
1313 error = device_move_class_links(dev, old_parent, new_parent); 1320 error = device_move_class_links(dev, old_parent, new_parent);
@@ -1317,9 +1324,12 @@ int device_move(struct device *dev, struct device *new_parent)
1317 if (!kobject_move(&dev->kobj, &old_parent->kobj)) { 1324 if (!kobject_move(&dev->kobj, &old_parent->kobj)) {
1318 if (new_parent) 1325 if (new_parent)
1319 klist_remove(&dev->knode_parent); 1326 klist_remove(&dev->knode_parent);
1320 if (old_parent) 1327 dev->parent = old_parent;
1328 if (old_parent) {
1321 klist_add_tail(&dev->knode_parent, 1329 klist_add_tail(&dev->knode_parent,
1322 &old_parent->klist_children); 1330 &old_parent->klist_children);
1331 set_dev_node(dev, dev_to_node(old_parent));
1332 }
1323 } 1333 }
1324 cleanup_glue_dir(dev, new_parent_kobj); 1334 cleanup_glue_dir(dev, new_parent_kobj);
1325 put_device(new_parent); 1335 put_device(new_parent);