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

[deliverable/linux.git] / arch / s390 / Kconfig

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 25510adb07d3324d0bc7f33f7906828ca5a02ea2..4827870f7a6d8c00925b7d052ed68efda20f364e 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -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
@@ -423,6 +423,43 @@ config NODES_SHIFT
          Specify the maximum number of NUMA nodes available on the target
          system. Increases memory reserved to accommodate various tables.
 
+menu "Select NUMA modes"
+       depends on NUMA
+
+config NUMA_EMU
+       bool "NUMA emulation"
+       default y
+       help
+         Numa emulation mode will split the available system memory into
+         equal chunks which then are distributed over the configured number
+         of nodes in a round-robin manner.
+
+         The number of fake nodes is limited by the number of available memory
+         chunks (i.e. memory size / fake size) and the number of supported
+         nodes in the kernel.
+
+         The CPUs are assigned to the nodes in a way that partially respects
+         the original machine topology (if supported by the machine).
+         Fair distribution of the CPUs is not guaranteed.
+
+config EMU_SIZE
+       hex "NUMA emulation memory chunk size"
+       default 0x10000000
+       range 0x400000 0x100000000
+       depends on NUMA_EMU
+       help
+         Select the default size by which the memory is chopped and then
+         assigned to emulated NUMA nodes.
+
+         This can be overridden by specifying
+
+         emu_size=<n>
+
+         on the kernel command line where also suffixes K, M, G, and T are
+         supported.
+
+endmenu
+
 config SCHED_MC
        def_bool n