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

[mirror_ubuntu-eoan-kernel.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index c7f120aaa98fe0d21ebbdff7186b32c7547a5ac8..3da87e19887827f55f14bd47bca849bdc9a14492 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -80,6 +80,7 @@ config ARCH_HAS_DMA_SET_COHERENT_MASK
 config PPC
        bool
        default y
+       select BUILDTIME_EXTABLE_SORT
        select ARCH_MIGHT_HAVE_PC_PARPORT
        select ARCH_MIGHT_HAVE_PC_SERIO
        select BINFMT_ELF
@@ -163,6 +164,7 @@ config PPC
        select ARCH_HAS_SCALED_CPUTIME if VIRT_CPU_ACCOUNTING_NATIVE
        select HAVE_ARCH_HARDENED_USERCOPY
        select HAVE_KERNEL_GZIP
+       select HAVE_CC_STACKPROTECTOR
 
 config GENERIC_CSUM
        def_bool CPU_LITTLE_ENDIAN
@@ -396,6 +398,14 @@ config MPROFILE_KERNEL
        depends on PPC64 && CPU_LITTLE_ENDIAN
        def_bool !DISABLE_MPROFILE_KERNEL
 
+config USE_THIN_ARCHIVES
+       bool "Build the kernel using thin archives"
+       default n
+       select THIN_ARCHIVES
+       help
+         Build the kernel using thin archives.
+         If you're unsure say N.
+
 config IOMMU_HELPER
        def_bool PPC64
 
@@ -456,6 +466,19 @@ config KEXEC
          interface is strongly in flux, so no good recommendation can be
          made.
 
+config KEXEC_FILE
+       bool "kexec file based system call"
+       select KEXEC_CORE
+       select BUILD_BIN2C
+       depends on PPC64
+       depends on CRYPTO=y
+       depends on CRYPTO_SHA256=y
+       help
+         This is a new version of the kexec system call. This call is
+         file based and takes in file descriptors as system call arguments
+         for kernel and initramfs as opposed to a list of segments as is the
+         case for the older kexec call.
+
 config RELOCATABLE
        bool "Build a relocatable kernel"
        depends on (PPC64 && !COMPILE_TEST) || (FLATMEM && (44x || FSL_BOOKE))
@@ -479,6 +502,15 @@ config RELOCATABLE
          setting can still be useful to bootwrappers that need to know the
          load address of the kernel (eg. u-boot/mkimage).
 
+config RELOCATABLE_TEST
+       bool "Test relocatable kernel"
+       depends on (PPC64 && RELOCATABLE)
+       default n
+       help
+         This runs the relocatable kernel at the address it was initially
+         loaded at, which tends to be non-zero and therefore test the
+         relocation code.
+
 config CRASH_DUMP
        bool "Build a kdump crash kernel"
        depends on PPC64 || 6xx || FSL_BOOKE || (44x && !SMP)
@@ -490,7 +522,7 @@ config CRASH_DUMP
 
 config FA_DUMP
        bool "Firmware-assisted dump"
-       depends on PPC64 && PPC_RTAS && CRASH_DUMP && KEXEC
+       depends on PPC64 && PPC_RTAS && CRASH_DUMP && KEXEC_CORE
        help
          A robust mechanism to get reliable kernel crash dump with
          assistance from firmware. This approach does not use kexec,
@@ -549,6 +581,13 @@ config ARCH_SPARSEMEM_DEFAULT
 config SYS_SUPPORTS_HUGETLBFS
        bool
 
+config ILLEGAL_POINTER_VALUE
+       hex
+       # This is roughly half way between the top of user space and the bottom
+       # of kernel space, which seems about as good as we can get.
+       default 0x5deadbeef0000000 if PPC64
+       default 0
+
 source "mm/Kconfig"
 
 config ARCH_MEMORY_PROBE