Merge tag 'remoteproc-4.1-next' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/arch/Kconfig b/arch/Kconfig
index c88c23f0a1da0a22f7da170b60b7f0f7b8aedf90..a65eafb24997e547168b152f04f96fe2e1aba01e 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -32,7 +32,7 @@ config HAVE_OPROFILE
 
 config OPROFILE_NMI_TIMER
        def_bool y
-       depends on PERF_EVENTS && HAVE_PERF_EVENTS_NMI
+       depends on PERF_EVENTS && HAVE_PERF_EVENTS_NMI && !PPC64
 
 config KPROBES
        bool "Kprobes"
@@ -491,6 +491,14 @@ config PGTABLE_LEVELS
        int
        default 2
 
+config ARCH_HAS_ELF_RANDOMIZE
+       bool
+       help
+         An architecture supports choosing randomized locations for
+         stack, mmap, brk, and ET_DYN. Defined functions:
+         - arch_mmap_rnd()
+         - arch_randomize_brk()
+
 #
 # ABI hall of shame
 #