1 files changed, 4 insertions, 15 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index a80669209155..e84943d24e5c 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -137,7 +137,7 @@ config PPC
         select ARCH_HAS_PMEM_API                if PPC64
         select ARCH_HAS_PTE_SPECIAL
         select ARCH_HAS_MEMBARRIER_CALLBACKS
-        select ARCH_HAS_SCALED_CPUTIME          if VIRT_CPU_ACCOUNTING_NATIVE
+        select ARCH_HAS_SCALED_CPUTIME          if VIRT_CPU_ACCOUNTING_NATIVE && PPC64
         select ARCH_HAS_SG_CHAIN
         select ARCH_HAS_STRICT_KERNEL_RWX       if ((PPC_BOOK3S_64 || PPC32) && !RELOCATABLE && !HIBERNATION)
         select ARCH_HAS_TICK_BROADCAST          if GENERIC_CLOCKEVENTS_BROADCAST
@@ -180,6 +180,8 @@ config PPC
         select HAVE_ARCH_SECCOMP_FILTER
         select HAVE_ARCH_TRACEHOOK
         select HAVE_CBPF_JIT                    if !PPC64
+        select HAVE_STACKPROTECTOR              if PPC64 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r13)
+        select HAVE_STACKPROTECTOR              if PPC32 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r2)
         select HAVE_CONTEXT_TRACKING            if PPC64
         select HAVE_DEBUG_KMEMLEAK
         select HAVE_DEBUG_STACKOVERFLOW
@@ -188,6 +190,7 @@ config PPC
         select HAVE_EBPF_JIT                    if PPC64
         select HAVE_EFFICIENT_UNALIGNED_ACCESS  if !(CPU_LITTLE_ENDIAN && POWER7_CPU)
         select HAVE_FTRACE_MCOUNT_RECORD
+        select HAVE_FUNCTION_ERROR_INJECTION
         select HAVE_FUNCTION_GRAPH_TRACER
         select HAVE_FUNCTION_TRACER
         select HAVE_GCC_PLUGINS                 if GCC_VERSION >= 50200   # plugin support on gcc <= 5.1 is buggy on PPC
@@ -285,12 +288,10 @@ config ARCH_MAY_HAVE_PC_FDC
 
 config PPC_UDBG_16550
         bool
-        default n
 
 config GENERIC_TBSYNC
         bool
         default y if PPC32 && SMP
-        default n
 
 config AUDIT_ARCH
         bool
@@ -309,13 +310,11 @@ config EPAPR_BOOT
         bool
         help
           Used to allow a board to specify it wants an ePAPR compliant wrapper.
-        default n
 
 config DEFAULT_UIMAGE
         bool
         help
           Used to allow a board to specify it wants a uImage built by default
-        default n
 
 config ARCH_HIBERNATION_POSSIBLE
         bool
@@ -329,11 +328,9 @@ config ARCH_SUSPEND_POSSIBLE
 
 config PPC_DCR_NATIVE
         bool
-        default n
 
 config PPC_DCR_MMIO
         bool
-        default n
 
 config PPC_DCR
         bool
@@ -344,7 +341,6 @@ config PPC_OF_PLATFORM_PCI
         bool
         depends on PCI
         depends on PPC64 # not supported on 32 bits yet
-        default n
 
 config ARCH_SUPPORTS_DEBUG_PAGEALLOC
         depends on PPC32 || PPC_BOOK3S_64
@@ -447,14 +443,12 @@ config PPC_TRANSACTIONAL_MEM
        depends on SMP
        select ALTIVEC
        select VSX
-       default n
        ---help---
          Support user-mode Transactional Memory on POWERPC.
 
 config LD_HEAD_STUB_CATCH
         bool "Reserve 256 bytes to cope with linker stubs in HEAD text" if EXPERT
         depends on PPC64
-        default n
         help
           Very large kernels can cause linker branch stubs to be generated by
           code in head_64.S, which moves the head text sections out of their
@@ -557,7 +551,6 @@ config RELOCATABLE
 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
@@ -769,7 +762,6 @@ config PPC_SUBPAGE_PROT
 
 config PPC_COPRO_BASE
         bool
-        default n
 
 config SCHED_SMT
         bool "SMT (Hyperthreading) scheduler support"
@@ -892,7 +884,6 @@ config PPC_INDIRECT_PCI
         bool
         depends on PCI
         default y if 40x || 44x
-        default n
 
 config EISA
         bool
@@ -989,7 +980,6 @@ source "drivers/pcmcia/Kconfig"
 
 config HAS_RAPIDIO
         bool
-        default n
 
 config RAPIDIO
         tristate "RapidIO support"
@@ -1012,7 +1002,6 @@ endmenu
 
 config NONSTATIC_KERNEL
         bool
-        default n
 
 menu "Advanced setup"
         depends on PPC32