diff options
author | Michal Hocko <mhocko@suse.com> | 2017-07-06 18:41:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-06 19:24:35 -0400 |
commit | f70029bbaacbfa8f082d2b4988717cba4e269f17 (patch) | |
tree | da4860c5227a317637194b6ca9ee4c6becfddb53 /drivers/base/node.c | |
parent | 57c0a17238e22395428248c53f8e390c051c88b8 (diff) |
mm, memory_hotplug: drop CONFIG_MOVABLE_NODE
Commit 20b2f52b73fe ("numa: add CONFIG_MOVABLE_NODE for
movable-dedicated node") has introduced CONFIG_MOVABLE_NODE without a
good explanation on why it is actually useful.
It makes a lot of sense to make movable node semantic opt in but we
already have that because the feature has to be explicitly enabled on
the kernel command line. A config option on top only makes the
configuration space larger without a good reason. It also adds an
additional ifdefery that pollutes the code.
Just drop the config option and make it de-facto always enabled. This
shouldn't introduce any change to the semantic.
Link: http://lkml.kernel.org/r/20170529114141.536-3-mhocko@kernel.org
Signed-off-by: Michal Hocko <mhocko@suse.com>
Acked-by: Reza Arbab <arbab@linux.vnet.ibm.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Jerome Glisse <jglisse@redhat.com>
Cc: Yasuaki Ishimatsu <yasu.isimatu@gmail.com>
Cc: Xishi Qiu <qiuxishi@huawei.com>
Cc: Kani Toshimitsu <toshi.kani@hpe.com>
Cc: Chen Yucong <slaoub@gmail.com>
Cc: Joonsoo Kim <js1304@gmail.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Daniel Kiper <daniel.kiper@oracle.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/base/node.c')
-rw-r--r-- | drivers/base/node.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/base/node.c b/drivers/base/node.c index 6b1ee371ee97..73d39bc58c42 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c | |||
@@ -639,9 +639,7 @@ static struct node_attr node_state_attr[] = { | |||
639 | #ifdef CONFIG_HIGHMEM | 639 | #ifdef CONFIG_HIGHMEM |
640 | [N_HIGH_MEMORY] = _NODE_ATTR(has_high_memory, N_HIGH_MEMORY), | 640 | [N_HIGH_MEMORY] = _NODE_ATTR(has_high_memory, N_HIGH_MEMORY), |
641 | #endif | 641 | #endif |
642 | #ifdef CONFIG_MOVABLE_NODE | ||
643 | [N_MEMORY] = _NODE_ATTR(has_memory, N_MEMORY), | 642 | [N_MEMORY] = _NODE_ATTR(has_memory, N_MEMORY), |
644 | #endif | ||
645 | [N_CPU] = _NODE_ATTR(has_cpu, N_CPU), | 643 | [N_CPU] = _NODE_ATTR(has_cpu, N_CPU), |
646 | }; | 644 | }; |
647 | 645 | ||
@@ -652,9 +650,7 @@ static struct attribute *node_state_attrs[] = { | |||
652 | #ifdef CONFIG_HIGHMEM | 650 | #ifdef CONFIG_HIGHMEM |
653 | &node_state_attr[N_HIGH_MEMORY].attr.attr, | 651 | &node_state_attr[N_HIGH_MEMORY].attr.attr, |
654 | #endif | 652 | #endif |
655 | #ifdef CONFIG_MOVABLE_NODE | ||
656 | &node_state_attr[N_MEMORY].attr.attr, | 653 | &node_state_attr[N_MEMORY].attr.attr, |
657 | #endif | ||
658 | &node_state_attr[N_CPU].attr.attr, | 654 | &node_state_attr[N_CPU].attr.attr, |
659 | NULL | 655 | NULL |
660 | }; | 656 | }; |