mm: add numa node symlink for cpu devices in sysfs

[firefly-linux-kernel-4.4.55.git] / drivers / base / node.c

diff --git a/drivers/base/node.c b/drivers/base/node.c
index 9b9acc39a1eb6b16054af404c3406df3d6010151..41414113b9f0530c3dc6346a5f8cc6f0a93b0387 100644 (file)
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -271,6 +271,7 @@ struct node node_devices[MAX_NUMNODES];
  */
 int register_cpu_under_node(unsigned int cpu, unsigned int nid)
 {
+       int ret;
        struct sys_device *obj;
 
        if (!node_online(nid))
@@ -280,9 +281,15 @@ int register_cpu_under_node(unsigned int cpu, unsigned int nid)
        if (!obj)
                return 0;
 
-       return sysfs_create_link(&node_devices[nid].sysdev.kobj,
+       ret = sysfs_create_link(&node_devices[nid].sysdev.kobj,
                                &obj->kobj,
                                kobject_name(&obj->kobj));
+       if (ret)
+               return ret;
+
+       return sysfs_create_link(&obj->kobj,
+                                &node_devices[nid].sysdev.kobj,
+                                kobject_name(&node_devices[nid].sysdev.kobj));
 }
 
 int unregister_cpu_under_node(unsigned int cpu, unsigned int nid)
@@ -298,6 +305,8 @@ int unregister_cpu_under_node(unsigned int cpu, unsigned int nid)
 
        sysfs_remove_link(&node_devices[nid].sysdev.kobj,
                          kobject_name(&obj->kobj));
+       sysfs_remove_link(&obj->kobj,
+                         kobject_name(&node_devices[nid].sysdev.kobj));
 
        return 0;
 }