diff options
| author | Emanuele Ghidoli <emanuele.ghidoli@toradex.com> | 2025-06-19 08:37:27 +0200 |
|---|---|---|
| committer | Emanuele Ghidoli <emanuele.ghidoli@toradex.com> | 2025-06-19 10:55:50 +0200 |
| commit | 3bb604cef85fb366931a777a20579cc7c24b6c5c (patch) | |
| tree | 855a4c90b2b093047060d9a5c5888a27e68e54cd /samples/ftrace/sample-trace-array.c | |
| parent | 1e78582cc49cd07d726ea073178625c1cbbed013 (diff) | |
| parent | 58485ff1a74f6c5be9e7c6aafb7293e4337348e7 (diff) | |
Merge tag 'v6.1.141' into toradex_ti-linux-6.1.y
This is the 6.1.141 stable release
Conflicts:
drivers/spi/spi-cadence-quadspi.c
Signed-off-by: Emanuele Ghidoli <emanuele.ghidoli@toradex.com>
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 6aba02a31c96..77685a7eb767 100644 --- a/samples/ftrace/sample-trace-array.c +++ b/samples/ftrace/sample-trace-array.c @@ -112,7 +112,7 @@ static int __init sample_trace_array_init(void) /* * If context specific per-cpu buffers havent already been allocated. */ - trace_printk_init_buffers(); + trace_array_init_printk(tr); simple_tsk = kthread_run(simple_thread, NULL, "sample-instance"); if (IS_ERR(simple_tsk)) { |