diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-02-16 11:52:16 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-02-16 11:52:16 -0300 |
| commit | c1bd8a2b9fbc304995fb03356f878579e50d3dd8 (patch) | |
| tree | c5599739225f20c52f56c189bed786d68de64368 /kernel/trace/bpf_trace.c | |
| parent | a89dbc9b988f3ba8700df3c58614744de0c5043f (diff) | |
| parent | 105f75ebf9519c239c96f9b16e16520f45fea72b (diff) | |
| download | linux-c1bd8a2b9fbc304995fb03356f878579e50d3dd8.tar.gz | |
Merge branch 'perf/urgent' into perf/core
To get some fixes that didn't made into 5.11. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'kernel/trace/bpf_trace.c')
| -rw-r--r-- | kernel/trace/bpf_trace.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index 6c0018abe68a..764400260eb6 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -96,9 +96,6 @@ unsigned int trace_call_bpf(struct trace_event_call *call, void *ctx) { unsigned int ret; - if (in_nmi()) /* not supported yet */ - return 1; - cant_sleep(); if (unlikely(__this_cpu_inc_return(bpf_prog_active) != 1)) { |