Merge tag 'powerpc-4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[karo-tx-linux.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 053382616533a808b0736fe0f04c2e5cf2db9d1c..f07f727cbfd211cdf29375cd6ad3faa7012b0652 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -22,6 +22,48 @@ config MMU
        bool
        default y
 
+config ARCH_MMAP_RND_BITS_MAX
+       # On Book3S 64, the default virtual address space for 64-bit processes
+       # is 2^47 (128TB). As a maximum, allow randomisation to consume up to
+       # 32T of address space (2^45), which should ensure a reasonable gap
+       # between bottom-up and top-down allocations for applications that
+       # consume "normal" amounts of address space. Book3S 64 only supports 64K
+       # and 4K page sizes.
+       default 29 if PPC_BOOK3S_64 && PPC_64K_PAGES # 29 = 45 (32T) - 16 (64K)
+       default 33 if PPC_BOOK3S_64                  # 33 = 45 (32T) - 12 (4K)
+       #
+       # On all other 64-bit platforms (currently only Book3E), the virtual
+       # address space is 2^46 (64TB). Allow randomisation to consume up to 16T
+       # of address space (2^44). Only 4K page sizes are supported.
+       default 32 if 64BIT     # 32 = 44 (16T) - 12 (4K)
+       #
+       # For 32-bit, use the compat values, as they're the same.
+       default ARCH_MMAP_RND_COMPAT_BITS_MAX
+
+config ARCH_MMAP_RND_BITS_MIN
+       # Allow randomisation to consume up to 1GB of address space (2^30).
+       default 14 if 64BIT && PPC_64K_PAGES    # 14 = 30 (1GB) - 16 (64K)
+       default 18 if 64BIT                     # 18 = 30 (1GB) - 12 (4K)
+       #
+       # For 32-bit, use the compat values, as they're the same.
+       default ARCH_MMAP_RND_COMPAT_BITS_MIN
+
+config ARCH_MMAP_RND_COMPAT_BITS_MAX
+       # Total virtual address space for 32-bit processes is 2^31 (2GB).
+       # Allow randomisation to consume up to 512MB of address space (2^29).
+       default 11 if PPC_256K_PAGES    # 11 = 29 (512MB) - 18 (256K)
+       default 13 if PPC_64K_PAGES     # 13 = 29 (512MB) - 16 (64K)
+       default 15 if PPC_16K_PAGES     # 15 = 29 (512MB) - 14 (16K)
+       default 17                      # 17 = 29 (512MB) - 12 (4K)
+
+config ARCH_MMAP_RND_COMPAT_BITS_MIN
+       # Total virtual address space for 32-bit processes is 2^31 (2GB).
+       # Allow randomisation to consume up to 8MB of address space (2^23).
+       default 5 if PPC_256K_PAGES     #  5 = 23 (8MB) - 18 (256K)
+       default 7 if PPC_64K_PAGES      #  7 = 23 (8MB) - 16 (64K)
+       default 9 if PPC_16K_PAGES      #  9 = 23 (8MB) - 14 (16K)
+       default 11                      # 11 = 23 (8MB) - 12 (4K)
+
 config HAVE_SETUP_PER_CPU_AREA
        def_bool PPC64
 
@@ -38,6 +80,11 @@ config NR_IRQS
          /proc/interrupts. If you configure your system to have too few,
          drivers will fail to load or worse - handle with care.
 
+config NMI_IPI
+       bool
+       depends on SMP && (DEBUGGER || KEXEC_CORE)
+       default y
+
 config STACKTRACE_SUPPORT
        bool
        default y
@@ -119,6 +166,8 @@ config PPC
        select HAVE_ARCH_AUDITSYSCALL
        select HAVE_ARCH_JUMP_LABEL
        select HAVE_ARCH_KGDB
+       select HAVE_ARCH_MMAP_RND_BITS
+       select HAVE_ARCH_MMAP_RND_COMPAT_BITS   if COMPAT
        select HAVE_ARCH_SECCOMP_FILTER
        select HAVE_ARCH_TRACEHOOK
        select HAVE_CBPF_JIT                    if !PPC64
@@ -141,6 +190,7 @@ config PPC
        select HAVE_IRQ_EXIT_ON_IRQ_STACK
        select HAVE_KERNEL_GZIP
        select HAVE_KPROBES
+       select HAVE_KPROBES_ON_FTRACE
        select HAVE_KRETPROBES
        select HAVE_LIVEPATCH                   if HAVE_DYNAMIC_FTRACE_WITH_REGS
        select HAVE_MEMBLOCK
@@ -489,7 +539,7 @@ config KEXEC_FILE
 
 config RELOCATABLE
        bool "Build a relocatable kernel"
-       depends on (PPC64 && !COMPILE_TEST) || (FLATMEM && (44x || FSL_BOOKE))
+       depends on PPC64 || (FLATMEM && (44x || FSL_BOOKE))
        select NONSTATIC_KERNEL
        select MODULE_REL_CRCS if MODVERSIONS
        help
@@ -523,7 +573,7 @@ config RELOCATABLE_TEST
 config CRASH_DUMP
        bool "Build a kdump crash kernel"
        depends on PPC64 || 6xx || FSL_BOOKE || (44x && !SMP)
-       select RELOCATABLE if (PPC64 && !COMPILE_TEST) || 44x || FSL_BOOKE
+       select RELOCATABLE if PPC64 || 44x || FSL_BOOKE
        help
          Build a kernel suitable for use as a kdump capture kernel.
          The same kernel binary can be used as production kernel and dump
@@ -585,7 +635,7 @@ config ARCH_SPARSEMEM_ENABLE
 
 config ARCH_SPARSEMEM_DEFAULT
        def_bool y
-       depends on (SMP && PPC_PSERIES) || PPC_PS3
+       depends on PPC_BOOK3S_64
 
 config SYS_SUPPORTS_HUGETLBFS
        bool
@@ -677,6 +727,16 @@ config PPC_256K_PAGES
 
 endchoice
 
+config THREAD_SHIFT
+       int "Thread shift" if EXPERT
+       range 13 15
+       default "15" if PPC_256K_PAGES
+       default "14" if PPC64
+       default "13"
+       help
+         Used to define the stack size. The default is almost always what you
+         want. Only change this if you know what you are doing.
+
 config FORCE_MAX_ZONEORDER
        int "Maximum zone order"
        range 8 9 if PPC64 && PPC_64K_PAGES