From e03beb2f39649ad2a3235f42a401b7efba58e233 Mon Sep 17 00:00:00 2001 From: Yasuaki Ishimatsu Date: Thu, 25 Oct 2012 12:14:47 +1100 Subject: [PATCH] memory hotplug: suppress "Device nodeX does not have a release() function" warning 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 Signed-off-by: Wen Congyang Acked-by: David Rientjes Cc: Jiang Liu Cc: Minchan Kim Acked-by: KOSAKI Motohiro Cc: Greg KH Signed-off-by: Andrew Morton --- drivers/base/node.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/base/node.c b/drivers/base/node.c index af1a177216f1..13c0ddf0391d 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -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){ -- 2.39.5