From 9972d540c143150004d87a458a1d33ba9a155c3b Mon Sep 17 00:00:00 2001
From: Alex Chiang <achiang@hp.com>
Date: Mon, 14 Dec 2009 17:59:08 -0800
Subject: [PATCH] --- yaml --- r: 176279 b: refs/heads/master c:
 1830794ae6392ce12d36dbcc5ff52f11298ddab6 h: refs/heads/master i:   176277:
 2963530c35bfa86e74509a8c4b414b6e02e86c60   176275:
 5431284ff47d3e9a462f7f06c1c632f004ce2a4b   176271:
 ee465726bb53820c194fe6957d64b36a8ca3d32e v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/base/node.c | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 88c7c3ab759f..8abf1936b590 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9d52dad9447d0db4b52d67d5e9e9d339b5e8302
+refs/heads/master: 1830794ae6392ce12d36dbcc5ff52f11298ddab6
diff --git a/trunk/drivers/base/node.c b/trunk/drivers/base/node.c
index 9b9acc39a1eb..41414113b9f0 100644
--- a/trunk/drivers/base/node.c
+++ b/trunk/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;
 }