aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/configs/default_defconfig
diff options
context:
space:
mode:
authorPhilipp Hachtmann <phacht@linux.vnet.ibm.com>2015-05-08 17:40:44 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2015-08-04 14:06:56 +0200
commita763bc8b656d11b7424cd2696e19efca301d8aa4 (patch)
treeccc7d5515281706b9bed4f06da01909517480806 /arch/s390/configs/default_defconfig
parents390/numa: add emulation support (diff)
downloadlinux-dev-a763bc8b656d11b7424cd2696e19efca301d8aa4.tar.xz
linux-dev-a763bc8b656d11b7424cd2696e19efca301d8aa4.zip
s390/numa: enable support in s390 configs
Signed-off-by: Philipp Hachtmann <phacht@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/configs/default_defconfig')
-rw-r--r--arch/s390/configs/default_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/configs/default_defconfig b/arch/s390/configs/default_defconfig
index 940cbddd9237..0c98f1508542 100644
--- a/arch/s390/configs/default_defconfig
+++ b/arch/s390/configs/default_defconfig
@@ -13,6 +13,7 @@ CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_RCU_FAST_NO_HZ=y
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
+CONFIG_NUMA_BALANCING=y
CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_DEVICE=y
CONFIG_CPUSETS=y
@@ -50,6 +51,7 @@ CONFIG_LIVEPATCH=y
CONFIG_MARCH_Z196=y
CONFIG_TUNE_ZEC12=y
CONFIG_NR_CPUS=256
+CONFIG_NUMA=y
CONFIG_PREEMPT=y
CONFIG_HZ_100=y
CONFIG_MEMORY_HOTPLUG=y