summaryrefslogtreecommitdiffstats
path: root/kernel/events
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-11-11 18:24:55 +0900
committerDavid S. Miller <davem@davemloft.net>2017-11-11 18:24:55 +0900
commitf3edacbd697f94a743fff1a3d26910ab99948ba7 (patch)
treec185057f2e3ae783ad3ccd5b5b96af200d2eb618 /kernel/events
parentbee955cd3ab4f1a1eb8fc16e7ed69364143df8d7 (diff)
downloadlinux-f3edacbd697f94a743fff1a3d26910ab99948ba7.tar.bz2
bpf: Revert bpf_overrid_function() helper changes.
NACK'd by x86 maintainer. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/events')
-rw-r--r--kernel/events/core.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c
index ac240d31b5bf..42d24bd64ea4 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -8171,13 +8171,6 @@ static int perf_event_set_bpf_prog(struct perf_event *event, u32 prog_fd)
return -EINVAL;
}
- /* Kprobe override only works for kprobes, not uprobes. */
- if (prog->kprobe_override &&
- !(event->tp_event->flags & TRACE_EVENT_FL_KPROBE)) {
- bpf_prog_put(prog);
- return -EINVAL;
- }
-
if (is_tracepoint || is_syscall_tp) {
int off = trace_event_get_offsets(event->tp_event);