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 474904a8e540e040e318f14a60fea3bf1f387e77..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"
@@ -497,6 +497,7 @@ config ARCH_HAS_ELF_RANDOMIZE
          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