From 1237e9fceab09a10b39f585075ad694715dcfcd9 Mon Sep 17 00:00:00 2001 From: dulibo1 Date: Mon, 22 Apr 2024 12:22:22 +0800 Subject: [PATCH] smp:fix sim build error under config CONFIG_SMP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CC: sim/sim_smpsignal.c init/nx_smpstart.c: In function ‘nx_idle_trampoline’: init/nx_smpstart.c:68:21: warning: unused variable ‘tcb’ [-Wunused-variable] 68 | FAR struct tcb_s *tcb = this_task_inirq(); | ^~~ sim/sim_smpsignal.c: In function ‘host_cpu_started’: sim/sim_smpsignal.c:271:17: warning: unused variable ‘tcb’ [-Wunused-variable] 271 | struct tcb_s *tcb = this_task(); sim/sim_smpsignal.c:249:33: error: ‘cpu’ undeclared (first use in this function) 249 | restore_critical_section(tcb, cpu); | ^~~ Signed-off-by: buxiasen --- arch/sim/src/sim/sim_smpsignal.c | 6 +----- sched/init/nx_smpstart.c | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/sim/src/sim/sim_smpsignal.c b/arch/sim/src/sim/sim_smpsignal.c index 140adff8343..140ea6f879e 100644 --- a/arch/sim/src/sim/sim_smpsignal.c +++ b/arch/sim/src/sim/sim_smpsignal.c @@ -251,10 +251,6 @@ int up_cpu_paused_restore(void) nxsched_resume_scheduler(tcb); - /* Restore the cpu lock */ - - restore_critical_section(tcb, this_cpu()); - /* Then switch contexts. Any necessary address environment changes * will be made when the interrupt returns. */ @@ -274,7 +270,7 @@ int up_cpu_paused_restore(void) void host_cpu_started(void) { -#ifdef CONFIG_SCHED_INSTRUMENTATION +#ifdef CONFIG_SCHED_INSTRUMENTATION_SWITCH struct tcb_s *tcb = this_task(); /* Notify that this CPU has started */ diff --git a/sched/init/nx_smpstart.c b/sched/init/nx_smpstart.c index 60bceba3b1a..0deaf4e830a 100644 --- a/sched/init/nx_smpstart.c +++ b/sched/init/nx_smpstart.c @@ -66,7 +66,7 @@ void nx_idle_trampoline(void) { -#ifdef CONFIG_SCHED_INSTRUMENTATION +#ifdef CONFIG_SCHED_INSTRUMENTATION_SWITCH FAR struct tcb_s *tcb = this_task(); /* Announce that the IDLE task has started */