Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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>
Philipp Hachtmann 10 years ago
parent
c29a7baf09
commit
a763bc8b65
4 changed files with 10 additions and 3 deletions
Split View Show Diff Stats
  1. 3 3
      arch/s390/Kconfig
  2. 2 0
      arch/s390/configs/default_defconfig
  3. 2 0
      arch/s390/configs/gcov_defconfig
  4. 3 0
      arch/s390/configs/performance_defconfig

+ 3 - 3
arch/s390/Kconfig
View File 

@@ -99,7 +99,9 @@ config S390
 
 	select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE
 
 	select ARCH_SAVE_PAGE_KEYS if HIBERNATION
 
 	select ARCH_SUPPORTS_ATOMIC_RMW
 
+	select ARCH_SUPPORTS_NUMA_BALANCING
 
 	select ARCH_USE_CMPXCHG_LOCKREF
 
+	select ARCH_WANTS_PROT_NUMA_PROT_NONE
 
 	select ARCH_WANT_IPC_PARSE_VERSION
 
 	select BUILDTIME_EXTABLE_SORT
 
 	select CLONE_BACKWARDS2
 
@@ -112,6 +114,7 @@ config S390
 
 	select GENERIC_TIME_VSYSCALL
 
 	select HAVE_ALIGNED_STRUCT_PAGE if SLUB
 
 	select HAVE_ARCH_AUDITSYSCALL
 
+	select HAVE_ARCH_EARLY_PFN_TO_NID
 
 	select HAVE_ARCH_JUMP_LABEL
 
 	select HAVE_ARCH_SECCOMP_FILTER
 
 	select HAVE_ARCH_TRACEHOOK
 
@@ -153,9 +156,6 @@ config S390
 
 	select TTY
 
 	select VIRT_CPU_ACCOUNTING
 
 	select VIRT_TO_BUS
 
-	select ARCH_SUPPORTS_NUMA_BALANCING
 
-	select ARCH_WANTS_PROT_NUMA_PROT_NONE
 
-	select HAVE_ARCH_EARLY_PFN_TO_NID
 
 
 
 config SCHED_OMIT_FRAME_POINTER

+ 2 - 0
arch/s390/configs/default_defconfig
View File 

@@ -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

+ 2 - 0
arch/s390/configs/gcov_defconfig
View File 

@@ -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
 
@@ -49,6 +50,7 @@ CONFIG_DEFAULT_DEADLINE=y
 
 CONFIG_MARCH_Z196=y
 
 CONFIG_TUNE_ZEC12=y
 
 CONFIG_NR_CPUS=256
 
+CONFIG_NUMA=y
 
 CONFIG_HZ_100=y
 
 CONFIG_MEMORY_HOTPLUG=y
 
 CONFIG_MEMORY_HOTREMOVE=y

+ 3 - 0
arch/s390/configs/performance_defconfig
View File 

@@ -13,6 +13,8 @@ CONFIG_TASK_IO_ACCOUNTING=y
 
 CONFIG_RCU_FAST_NO_HZ=y
 
 CONFIG_IKCONFIG=y
 
 CONFIG_IKCONFIG_PROC=y
 
+CONFIG_NUMA_BALANCING=y
 
+# CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set
 
 CONFIG_CGROUP_FREEZER=y
 
 CONFIG_CGROUP_DEVICE=y
 
 CONFIG_CPUSETS=y
 
@@ -48,6 +50,7 @@ CONFIG_LIVEPATCH=y
 
 CONFIG_MARCH_Z196=y
 
 CONFIG_TUNE_ZEC12=y
 
 CONFIG_NR_CPUS=512
 
+CONFIG_NUMA=y
 
 CONFIG_HZ_100=y
 
 CONFIG_MEMORY_HOTPLUG=y
 
 CONFIG_MEMORY_HOTREMOVE=y