Hi all, Can somebody take a few moments to review it? This patch is too small, only changed two lines. Thanks, Thunder. On 2015/8/25 12:08, Zhen Lei wrote: > For now, in function device_add, the new device will be forced to > inherit the numa node of its parent. But this will override the device's > numa node which configured in devicetree. > > Signed-off-by: Zhen Lei <thunder.leizhen@xxxxxxxxxx> > --- > drivers/base/core.c | 2 +- > drivers/of/device.c | 11 ++++++----- > 2 files changed, 7 insertions(+), 6 deletions(-) > > diff --git a/drivers/base/core.c b/drivers/base/core.c > index dafae6d..e06de82 100644 > --- a/drivers/base/core.c > +++ b/drivers/base/core.c > @@ -1017,7 +1017,7 @@ int device_add(struct device *dev) > dev->kobj.parent = kobj; > > /* use parent numa_node */ > - if (parent) > + if (parent && (dev_to_node(dev) == NUMA_NO_NODE)) > set_dev_node(dev, dev_to_node(parent)); > > /* first, register with generic layer. */ > diff --git a/drivers/of/device.c b/drivers/of/device.c > index 8b91ea2..e5f47ce 100644 > --- a/drivers/of/device.c > +++ b/drivers/of/device.c > @@ -60,11 +60,12 @@ int of_device_add(struct platform_device *ofdev) > ofdev->name = dev_name(&ofdev->dev); > ofdev->id = -1; > > - /* device_add will assume that this device is on the same node as > - * the parent. If there is no parent defined, set the node > - * explicitly */ > - if (!ofdev->dev.parent) > - set_dev_node(&ofdev->dev, of_node_to_nid(ofdev->dev.of_node)); > + /* > + * If this device has not binding numa node in devicetree, that is > + * of_node_to_nid returns NUMA_NO_NODE. device_add will assume that this > + * device is on the same node as the parent. > + */ > + set_dev_node(&ofdev->dev, of_node_to_nid(ofdev->dev.of_node)); > > return device_add(&ofdev->dev); > } > -- > 2.5.0 > > > > . > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
