aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>2014-12-10 18:43:37 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-10 20:41:06 -0500
commit6f7c97e80b813879a17c0e8ef343cc414761e6f5 (patch)
treefced92ccad6306496a334bbc72d72b9d2fecd63b /init
parentfdaf7f5c40f3d20690c236298418acf72eb664b5 (diff)
mm/numa balancing: rearrange Kconfig entry
Add the default enable config option after the NUMA_BALANCING option so that it appears related in the nconfig interface. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Acked-by: David Rientjes <rientjes@google.com> Cc: Mel Gorman <mgorman@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig16
1 files changed, 8 insertions, 8 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 1761c72bc1a0..46768752130d 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -893,14 +893,6 @@ config ARCH_SUPPORTS_INT128
893config ARCH_WANT_NUMA_VARIABLE_LOCALITY 893config ARCH_WANT_NUMA_VARIABLE_LOCALITY
894 bool 894 bool
895 895
896config NUMA_BALANCING_DEFAULT_ENABLED
897 bool "Automatically enable NUMA aware memory/task placement"
898 default y
899 depends on NUMA_BALANCING
900 help
901 If set, automatic NUMA balancing will be enabled if running on a NUMA
902 machine.
903
904config NUMA_BALANCING 896config NUMA_BALANCING
905 bool "Memory placement aware NUMA scheduler" 897 bool "Memory placement aware NUMA scheduler"
906 depends on ARCH_SUPPORTS_NUMA_BALANCING 898 depends on ARCH_SUPPORTS_NUMA_BALANCING
@@ -913,6 +905,14 @@ config NUMA_BALANCING
913 905
914 This system will be inactive on UMA systems. 906 This system will be inactive on UMA systems.
915 907
908config NUMA_BALANCING_DEFAULT_ENABLED
909 bool "Automatically enable NUMA aware memory/task placement"
910 default y
911 depends on NUMA_BALANCING
912 help
913 If set, automatic NUMA balancing will be enabled if running on a NUMA
914 machine.
915
916menuconfig CGROUPS 916menuconfig CGROUPS
917 boolean "Control Group support" 917 boolean "Control Group support"
918 select KERNFS 918 select KERNFS