shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "tracing: Zero the pipe cpumask on alloc to avoid spurious -EBUSY"

Browse Source 
This reverts commit 1dd387668d which is
commit 3d07fa1dd1 upstream.

It fixes a commit that is about to be reverted due to ABI breakage in
Android.  If needed, it can come back in in an abi-safe way in the
future.

Bug: 161946584
Change-Id: Ida127a7112c9748ffdccfd6c5498e2a8334ba3dc
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2023-10-12 14:00:09 +00:00
parent 5c4d483e7c
commit 8d71a1ef6a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/trace/trace.c
View File

@@ -9396,7 +9396,7 @@ static struct trace_array *trace_array_create(const char *name)
if (!alloc_cpumask_var(&tr->tracing_cpumask, GFP_KERNEL)) if (!alloc_cpumask_var(&tr->tracing_cpumask, GFP_KERNEL))
goto out_free_tr; goto out_free_tr;
if (!zalloc_cpumask_var(&tr->pipe_cpumask, GFP_KERNEL)) if (!alloc_cpumask_var(&tr->pipe_cpumask, GFP_KERNEL))
goto out_free_tr; goto out_free_tr;
tr->trace_flags = global_trace.trace_flags & ~ZEROED_TRACE_FLAGS; tr->trace_flags = global_trace.trace_flags & ~ZEROED_TRACE_FLAGS;
@@ -10300,7 +10300,7 @@ __init static int tracer_alloc_buffers(void)
if (trace_create_savedcmd() < 0) if (trace_create_savedcmd() < 0)
goto out_free_temp_buffer; goto out_free_temp_buffer;
if (!zalloc_cpumask_var(&global_trace.pipe_cpumask, GFP_KERNEL)) if (!alloc_cpumask_var(&global_trace.pipe_cpumask, GFP_KERNEL))
goto out_free_savedcmd; goto out_free_savedcmd;
/* TODO: make the number of buffers hot pluggable with CPUS */ /* TODO: make the number of buffers hot pluggable with CPUS */