diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2021-04-01 21:16:37 +0300 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2021-04-01 21:16:37 +0300 |
| commit | 22d5755a852dca9895c263c24dae836dd14ae947 (patch) | |
| tree | 562d170a7b69fe463b067a6cffd3e92e6a76ab19 /kernel/trace/trace.c | |
| parent | 70193038a6ec9bbf10990a126432b0cbf56aa339 (diff) | |
| parent | 9deb193af69d3fd6dd8e47f292b67c805a787010 (diff) | |
| download | linux-22d5755a852dca9895c263c24dae836dd14ae947.tar.xz | |
Merge branch 'trace/ftrace/urgent' into HEAD
Needed to merge trace/ftrace/urgent to get:
Commit 59300b36f85 ("ftrace: Check if pages were allocated before calling free_pages()")
To clean up the code that is affected by it as well.
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index c8e54b674d3e..3834de91fb97 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -2985,7 +2985,8 @@ static void __ftrace_trace_stack(struct trace_buffer *buffer, size = nr_entries * sizeof(unsigned long); event = __trace_buffer_lock_reserve(buffer, TRACE_STACK, - sizeof(*entry) + size, trace_ctx); + (sizeof(*entry) - sizeof(entry->caller)) + size, + trace_ctx); if (!event) goto out; entry = ring_buffer_event_data(event); |