]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
memory hotplug: suppress "Device nodeX does not have a release() function" warning
authorYasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Fri, 12 Oct 2012 04:22:56 +0000 (15:22 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 16 Oct 2012 02:48:01 +0000 (13:48 +1100)
When calling unregister_node(), the function shows following message at
device_release().

"Device 'node2' does not have a release() function, it is broken and must
be fixed."

The reason is node's device struct does not have a release() function.

So the patch registers node_device_release() to the device's release()
function for suppressing the warning message.  Additionally, the patch
adds memset() to initialize a node struct into register_node().  Because
the node struct is part of node_devices[] array and it cannot be freed by
node_device_release().  So if system reuses the node struct, it has a
garbage.

Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
Acked-by: David Rientjes <rientjes@google.com>
Cc: Jiang Liu <liuj97@gmail.com>
Cc: Minchan Kim <minchan.kim@gmail.com>
Acked-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
drivers/base/node.c

index ef5115708dc761a1f63e9cfaae59abefefd58f9d..57a23336e2b2313e0833b25d869206f11c70ba49 100644 (file)
@@ -252,6 +252,14 @@ static inline void hugetlb_register_node(struct node *node) {}
 static inline void hugetlb_unregister_node(struct node *node) {}
 #endif
 
+static void node_device_release(struct device *dev)
+{
+#if defined(CONFIG_MEMORY_HOTPLUG_SPARSE) && defined(CONFIG_HUGETLBFS)
+       struct node *node_dev = to_node(dev);
+
+       flush_work(&node_dev->node_work);
+#endif
+}
 
 /*
  * register_node - Setup a sysfs device for a node.
@@ -263,8 +271,11 @@ int register_node(struct node *node, int num, struct node *parent)
 {
        int error;
 
+       memset(node, 0, sizeof(*node));
+
        node->dev.id = num;
        node->dev.bus = &node_subsys;
+       node->dev.release = node_device_release;
        error = device_register(&node->dev);
 
        if (!error){