projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-pmem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
Kconfig
diff --git
a/arch/Kconfig
b/arch/Kconfig
index e1068987bad1c6fef286d084ca245cafbe0a8934..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"