Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / base / node.c

diff --git a/drivers/base/node.c b/drivers/base/node.c
index c6d3ae05f1ca4d98667490d7db0b6375f61b9c26..472168cd0c9787a99e7d7d70d4a22cb8bf8680ab 100644 (file)
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -289,8 +289,6 @@ static int register_node(struct node *node, int num, struct node *parent)
                device_create_file(&node->dev, &dev_attr_distance);
                device_create_file(&node->dev, &dev_attr_vmstat);
 
-               scan_unevictable_register_node(node);
-
                hugetlb_register_node(node);
 
                compaction_register_node(node);
@@ -314,7 +312,6 @@ void unregister_node(struct node *node)
        device_remove_file(&node->dev, &dev_attr_distance);
        device_remove_file(&node->dev, &dev_attr_vmstat);
 
-       scan_unevictable_unregister_node(node);
        hugetlb_unregister_node(node);          /* no-op, if memoryless node */
 
        device_unregister(&node->dev);
@@ -603,7 +600,6 @@ void unregister_one_node(int nid)
                return;
 
        unregister_node(node_devices[nid]);
-       kfree(node_devices[nid]);
        node_devices[nid] = NULL;
 }