From 73c7cc0b1e33593dfc57e06e024ae38fe191f674 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 30 Sep 2023 12:30:30 +0000 Subject: [PATCH] Revert "tracing: Zero the pipe cpumask on alloc to avoid spurious -EBUSY" This reverts commit 5103216b863fba74364c014cd2f77b0a837e808b which is commit 3d07fa1dd19035eb0b13ae6697efd5caa9033e74 upstream. The commit it fixes is about to be reverted, so also revert it. Bug: 161946584 Change-Id: I0c442ffd94cfe75b8d61318d2913de9b818ba7f3 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 73a6abe7d0b1..7ae5002cf5a4 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -8824,7 +8824,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; @@ -9705,7 +9705,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 */