projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linux-4.4' of git://github.com/skeggsb/linux into drm-fixes
[cascardo/linux.git]
/
kernel
/
trace
/
Kconfig
diff --git
a/kernel/trace/Kconfig
b/kernel/trace/Kconfig
index
8d6363f
..
e45db6b
100644
(file)
--- a/
kernel/trace/Kconfig
+++ b/
kernel/trace/Kconfig
@@
-434,7
+434,7
@@
config UPROBE_EVENT
config BPF_EVENTS
depends on BPF_SYSCALL
- depends on
KPROBE_EVENT || UPROBE_EVENT
+ depends on
(KPROBE_EVENT || UPROBE_EVENT) && PERF_EVENTS
bool
default y
help