[PATCH] trace/osnoise: Rename main variable to tracer_main

[PATCH] trace/osnoise: Rename main variable to tracer_main

[Daniel Bristot de Oliveira]

The *main variable in start_kthread() is causing warnings in some
compilers/analyzers. Although it is not necessarily a problem, it is
not a problem changing the variable name too.

Rename the *main variable to *tracer_main.

No functional change.

Fixes: c8895e271f79 ("trace/osnoise: Support hotplug operations")
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Daniel Bristot de Oliveira <bristot@kernel.org>
---
 kernel/trace/trace_osnoise.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/trace/trace_osnoise.c b/kernel/trace/trace_osnoise.c
index 0b11db9595b6..eda10d39da47 100644
--- a/kernel/trace/trace_osnoise.c
+++ b/kernel/trace/trace_osnoise.c
@@ -1576,20 +1576,20 @@ static void stop_per_cpu_kthreads(void)
 static int start_kthread(unsigned int cpu)
 {
 	struct task_struct *kthread;
-	void *main = osnoise_main;
+	void *tracer_main = osnoise_main;
 	char comm[24];
 
 #ifdef CONFIG_TIMERLAT_TRACER
 	if (osnoise_data.timerlat_tracer) {
 		snprintf(comm, 24, "timerlat/%d", cpu);
-		main = timerlat_main;
+		tracer_main = timerlat_main;
 	} else {
 		snprintf(comm, 24, "osnoise/%d", cpu);
 	}
 #else
 	snprintf(comm, 24, "osnoise/%d", cpu);
 #endif
-	kthread = kthread_create_on_cpu(main, NULL, cpu, comm);
+	kthread = kthread_create_on_cpu(tracer_main, NULL, cpu, comm);
 
 	if (IS_ERR(kthread)) {
 		pr_err(BANNER "could not start sampling thread\n");
-- 
2.31.1

Re: [PATCH] trace/osnoise: Rename main variable to tracer_main

[Randy Dunlap]

On 8/3/21 1:28 AM, Daniel Bristot de Oliveira wrote:
> The *main variable in start_kthread() is causing warnings in some
> compilers/analyzers. Although it is not necessarily a problem, it is
> not a problem changing the variable name too.
> 
> Rename the *main variable to *tracer_main.
> 
> No functional change.
> 
> Fixes: c8895e271f79 ("trace/osnoise: Support hotplug operations")
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Cc: Matthew Wilcox <willy@infradead.org>
> Cc: Steven Rostedt <rostedt@goodmis.org>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Daniel Bristot de Oliveira <bristot@kernel.org>

Acked-by: Randy Dunlap <rdunlap@infradead.org>

Thanks.

> ---
>   kernel/trace/trace_osnoise.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/kernel/trace/trace_osnoise.c b/kernel/trace/trace_osnoise.c
> index 0b11db9595b6..eda10d39da47 100644
> --- a/kernel/trace/trace_osnoise.c
> +++ b/kernel/trace/trace_osnoise.c
> @@ -1576,20 +1576,20 @@ static void stop_per_cpu_kthreads(void)
>   static int start_kthread(unsigned int cpu)
>   {
>   	struct task_struct *kthread;
> -	void *main = osnoise_main;
> +	void *tracer_main = osnoise_main;
>   	char comm[24];
>   
>   #ifdef CONFIG_TIMERLAT_TRACER
>   	if (osnoise_data.timerlat_tracer) {
>   		snprintf(comm, 24, "timerlat/%d", cpu);
> -		main = timerlat_main;
> +		tracer_main = timerlat_main;
>   	} else {
>   		snprintf(comm, 24, "osnoise/%d", cpu);
>   	}
>   #else
>   	snprintf(comm, 24, "osnoise/%d", cpu);
>   #endif
> -	kthread = kthread_create_on_cpu(main, NULL, cpu, comm);
> +	kthread = kthread_create_on_cpu(tracer_main, NULL, cpu, comm);
>   
>   	if (IS_ERR(kthread)) {
>   		pr_err(BANNER "could not start sampling thread\n");
> 


-- 
~Randy