Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

[firefly-linux-kernel-4.4.55.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 22b0940494bb5016be1fca2a98aa7b75c105487a..190cc48abc0cc683b8d53e9f8460d67cbe93c671 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -88,7 +88,7 @@ config PPC
        select ARCH_MIGHT_HAVE_PC_PARPORT
        select ARCH_MIGHT_HAVE_PC_SERIO
        select BINFMT_ELF
-       select ARCH_BINFMT_ELF_RANDOMIZE_PIE
+       select ARCH_HAS_ELF_RANDOMIZE
        select OF
        select OF_EARLY_FLATTREE
        select OF_RESERVED_MEM
@@ -126,7 +126,7 @@ config PPC
        select IRQ_FORCED_THREADING
        select HAVE_RCU_TABLE_FREE if SMP
        select HAVE_SYSCALL_TRACEPOINTS
-       select HAVE_BPF_JIT if PPC64
+       select HAVE_BPF_JIT
        select HAVE_ARCH_JUMP_LABEL
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select ARCH_HAS_GCOV_PROFILE_ALL
@@ -152,6 +152,7 @@ config PPC
        select DCACHE_WORD_ACCESS if PPC64 && CPU_LITTLE_ENDIAN
        select NO_BOOTMEM
        select HAVE_GENERIC_RCU_GUP
+       select HAVE_PERF_EVENTS_NMI if PPC64
 
 config GENERIC_CSUM
        def_bool CPU_LITTLE_ENDIAN
@@ -189,9 +190,6 @@ config ARCH_MAY_HAVE_PC_FDC
        bool
        default PCI
 
-config PPC_OF
-       def_bool y
-
 config PPC_UDBG_16550
        bool
        default n
@@ -297,6 +295,12 @@ config ZONE_DMA32
        bool
        default y if PPC64
 
+config PGTABLE_LEVELS
+       int
+       default 2 if !PPC64
+       default 3 if PPC_64K_PAGES
+       default 4
+
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"