From 8d71a1ef6a253353cc0e74d889f399d728704e2f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 12 Oct 2023 14:00:09 +0000 Subject: [PATCH] Revert "tracing: Zero the pipe cpumask on alloc to avoid spurious -EBUSY" This reverts commit 1dd387668d5bd911df0b21716fff6f5180b11e42 which is commit 3d07fa1dd19035eb0b13ae6697efd5caa9033e74 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 --- kernel/trace/trace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 23a2da26c187..05a1d812ad54 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -9396,7 +9396,7 @@ static struct trace_array *trace_array_create(const char *name) if (!alloc_cpumask_var(&tr->tracing_cpumask, GFP_KERNEL)) 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; 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) 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; /* TODO: make the number of buffers hot pluggable with CPUS */