2 files changed, 15 insertions, 3 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)
         parent = get_device(dev->parent);
         setup_parent(dev, parent);
 
+        /* use parent numa_node */
+        if (parent)
+                set_dev_node(dev, dev_to_node(parent));
+
         /* first, register with generic layer. */
         error = kobject_add(&dev->kobj, dev->kobj.parent, "%s", dev->bus_id);
         if (error)
@@ -1306,8 +1310,11 @@ int device_move(struct device *dev, struct device *new_parent)
         dev->parent = new_parent;
         if (old_parent)
                 klist_remove(&dev->knode_parent);
-        if (new_parent)
+        if (new_parent) {
                 klist_add_tail(&dev->knode_parent, &new_parent->klist_children);
+                set_dev_node(dev, dev_to_node(new_parent));
+        }
+
         if (!dev->class)
                 goto out_put;
         error = device_move_class_links(dev, old_parent, new_parent);
@@ -1317,9 +1324,12 @@ int device_move(struct device *dev, struct device *new_parent)
                 if (!kobject_move(&dev->kobj, &old_parent->kobj)) {
                         if (new_parent)
                                 klist_remove(&dev->knode_parent);
-                        if (old_parent)
+                        dev->parent = old_parent;
+                        if (old_parent) {
                                 klist_add_tail(&dev->knode_parent,
                                                &old_parent->klist_children);
+                                set_dev_node(dev, dev_to_node(old_parent));
+                        }
                 }
                 cleanup_glue_dir(dev, new_parent_kobj);
                 put_device(new_parent);
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)
         dev->dev.release = pci_release_dev;
         pci_dev_get(dev);
 
-        set_dev_node(&dev->dev, pcibus_to_node(bus));
         dev->dev.dma_mask = &dev->dma_mask;
         dev->dev.dma_parms = &dev->dma_parms;
         dev->dev.coherent_dma_mask = 0xffffffffull;
@@ -1128,6 +1127,9 @@ struct pci_bus * pci_create_bus(struct device *parent,
                 goto dev_reg_err;
         b->bridge = get_device(dev);
 
+        if (!parent)
+                set_dev_node(b->bridge, pcibus_to_node(b));
+
         b->dev.class = &pcibus_class;
         b->dev.parent = b->bridge;
         sprintf(b->dev.bus_id, "%04x:%02x", pci_domain_nr(b), bus);