diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2025-04-21 08:03:10 -0700 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2025-04-21 08:04:38 -0700 |
| commit | 5709be4c35ba760b001733939e20069de033a697 (patch) | |
| tree | f2f9c1dc4a9250b41e3c3adc31ce505898f89612 /samples/ftrace/sample-trace-array.c | |
| parent | 8582d9ab3efdebb88e0cd8beed8e0b9de76443e7 (diff) | |
| parent | 9d7a0577c9db35c4cc52db90bc415ea248446472 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after rc3
Cross-merge bpf and other fixes after downstream PRs.
No conflicts.
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'samples/ftrace/sample-trace-array.c')
| -rw-r--r-- | samples/ftrace/sample-trace-array.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/samples/ftrace/sample-trace-array.c b/samples/ftrace/sample-trace-array.c index d0ee9001c7b3..dac67c367457 100644 --- a/samples/ftrace/sample-trace-array.c +++ b/samples/ftrace/sample-trace-array.c @@ -82,7 +82,7 @@ static int simple_thread(void *arg) while (!kthread_should_stop()) simple_thread_func(count++); - del_timer(&mytimer); + timer_delete(&mytimer); cancel_work_sync(&trace_work); /* |