Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-21 04:52:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

arch: replace all nxsched_suspend/resume_*** with nxsched_switch_context
Build Documentation / build-html (push) Has been cancelled
Details
Docker-Linux / push (push) Has been cancelled
Details

Browse Source 
Complete the missing scheduling information in some architectures

In these architectures (riscv, avr, tricor) context switching
can occur in both up_switch_context and xx_doirq

Co-authored-by: yinshengkai <yinshengkai@xiaomi.com>
Signed-off-by: guoshengyuan1 <guoshengyuan1@xiaomi.com>
This commit is contained in:
guoshengyuan1
2025-09-23 10:24:02 +08:00
committed by GUIDINGLI
parent 7c01281757
commit 6a57c56925
36 changed files with 101 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/avr/src/avr/avr_doirq.c
+7 -1
View File
@@ -96,12 +96,18 @@ uint8_t *avr_doirq(uint8_t irq, uint8_t *regs)
if (regs != up_current_regs())
{
struct tcb_s *tcb = this_task();
/* Update scheduler parameters */
nxsched_switch_context(*running_task, tcb);
/* Record the new "running" task when context switch occurred.
* g_running_tasks[] is only used by assertion logic for reporting
* crashes.
*/
*running_task = this_task();
*running_task = tcb;
}
regs = up_current_regs(); /* Cast removes volatile attribute */
arch/avr/src/avr/avr_switchcontext.c
+1 -9
View File
@@ -56,10 +56,6 @@
void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
{
/* Update scheduler parameters */
nxsched_suspend_scheduler(rtcb);
/* Are we in an interrupt handler? */
if (up_current_regs())
@@ -70,10 +66,6 @@ void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
avr_savestate(rtcb->xcp.regs);
/* Update scheduler parameters */
nxsched_resume_scheduler(tcb);
/* Then switch contexts */
avr_restorestate(tcb->xcp.regs);
@@ -85,7 +77,7 @@ void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
{
/* Update scheduler parameters */
nxsched_resume_scheduler(tcb);
nxsched_switch_context(rtcb, tcb);
/* Record the new "running" task */
arch/avr/src/avr32/avr_doirq.c
+4
View File
@@ -109,6 +109,10 @@ uint32_t *avr_doirq(int irq, uint32_t *regs)
addrenv_switch(tcb);
#endif
/* Update scheduler parameters. */
nxsched_switch_context(*running_task, tcb);
/* Record the new "running" task when context switch occurred.
* g_running_tasks[] is only used by assertion logic for reporting
* crashes.
arch/avr/src/avr32/avr_switchcontext.c
+1 -9
View File
@@ -58,10 +58,6 @@
void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
{
/* Update scheduler parameters */
nxsched_suspend_scheduler(rtcb);
/* Are we in an interrupt handler? */
if (up_current_regs())
@@ -72,10 +68,6 @@ void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
avr_savestate(rtcb->xcp.regs);
/* Update scheduler parameters */
nxsched_resume_scheduler(tcb);
/* Then switch contexts. Any new address environment needed by
* the new thread will be instantiated before the return from
* interrupt.
@@ -99,7 +91,7 @@ void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
#endif
/* Update scheduler parameters */
nxsched_resume_scheduler(tcb);
nxsched_switch_context(rtcb, tcb);
/* Record the new "running" task */
arch/ceva/src/common/ceva_doirq.c
+4 -3
View File
@@ -87,17 +87,18 @@ uint32_t *ceva_doirq(int irq, uint32_t *regs)
if (regs != up_current_regs())
{
struct tcb_s *tcb = this_task();
/* Update scheduler parameters */
nxsched_suspend_scheduler(*running_task);
nxsched_resume_scheduler(this_task());
nxsched_switch_context(*running_task, tcb);
/* Record the new "running" task when context switch occurred.
* g_running_tasks[] is only used by assertion logic for reporting
* crashes.
*/
g_running_tasks[this_cpu()] = this_task();
*running_task = tcb;
regs = up_current_regs();
}
arch/ceva/src/common/ceva_switchcontext.c
+4
View File
@@ -90,6 +90,10 @@ void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
else
{
/* Update scheduler parameters */
nxsched_switch_context(rtcb, tcb);
/* Switch context to the context of the task at the head of the
* ready to run list.
*/
arch/hc/src/common/hc_doirq.c
+4
View File
@@ -109,6 +109,10 @@ uint8_t *hc_doirq(int irq, uint8_t *regs)
addrenv_switch(tcb);
#endif
/* Update scheduler parameters. */
nxsched_switch_context(*running_task, tcb);
/* Record the new "running" task when context switch occurred.
* g_running_tasks[] is only used by assertion logic for reporting
* crashes.
arch/hc/src/common/hc_switchcontext.c
+1 -9
View File
@@ -58,10 +58,6 @@
void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
{
/* Update scheduler parameters */
nxsched_suspend_scheduler(rtcb);
/* Are we in an interrupt handler? */
if (up_current_regs())
@@ -72,10 +68,6 @@ void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
hc_savestate(rtcb->xcp.regs);
/* Update scheduler parameters */
nxsched_resume_scheduler(tcb);
/* Then switch contexts. Any necessary address environment
* changes will be made when the interrupt returns.
*/
@@ -102,7 +94,7 @@ void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
#endif
/* Update scheduler parameters */
nxsched_resume_scheduler(tcb);
nxsched_switch_context(rtcb, tcb);
/* Record the new "running" task */
arch/mips/src/mips32/mips_doirq.c
+5 -1
View File
@@ -118,12 +118,16 @@ uint32_t *mips_doirq(int irq, uint32_t *regs)
addrenv_switch(tcb);
#endif
/* Update scheduler parameters. */
nxsched_switch_context(*running_task, tcb);
/* Record the new "running" task when context switch occurred.
* g_running_tasks[] is only used by assertion logic for reporting
* crashes.
*/
g_running_tasks[this_cpu()] = tcb;
*running_task = tcb;
}
/* If a context switch occurred while processing the interrupt then
arch/mips/src/mips32/mips_switchcontext.c
+1 -9
View File
@@ -59,10 +59,6 @@
void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
{
/* Update scheduler parameters */
nxsched_suspend_scheduler(rtcb);
/* Are we in an interrupt handler? */
if (up_current_regs())
@@ -73,10 +69,6 @@ void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
mips_savestate(rtcb->xcp.regs);
/* Update scheduler parameters */
nxsched_resume_scheduler(tcb);
/* Then switch contexts. Any necessary address environment
* changes will be made when the interrupt returns.
*/
@@ -90,7 +82,7 @@ void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
{
/* Update scheduler parameters */
nxsched_resume_scheduler(tcb);
nxsched_switch_context(rtcb, tcb);
/* Then switch contexts */
arch/misoc/src/lm32/lm32_doirq.c
+4
View File
@@ -103,6 +103,10 @@ uint32_t *lm32_doirq(int irq, uint32_t *regs)
addrenv_switch(tcb);
#endif
/* Update scheduler parameters. */
nxsched_switch_context(*running_task, tcb);
/* Record the new "running" task when context switch occurred.
* g_running_tasks[] is only used by assertion logic for reporting
* crashes.
arch/misoc/src/lm32/lm32_switchcontext.c
+1 -9
View File
@@ -59,10 +59,6 @@
void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
{
/* Update scheduler parameters */
nxsched_suspend_scheduler(rtcb);
/* Are we in an interrupt handler? */
if (up_current_regs())
@@ -73,10 +69,6 @@ void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
misoc_savestate(rtcb->xcp.regs);
/* Update scheduler parameters */
nxsched_resume_scheduler(tcb);
/* Then switch contexts. Any necessary address environment
* changes will be made when the interrupt returns.
*/
@@ -90,7 +82,7 @@ void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
{
/* Update scheduler parameters */
nxsched_resume_scheduler(tcb);
nxsched_switch_context(rtcb, tcb);
/* Then switch contexts */
arch/misoc/src/minerva/minerva_doirq.c
+5 -1
View File
@@ -102,12 +102,16 @@ uint32_t *minerva_doirq(int irq, uint32_t * regs)
addrenv_switch(tcb);
#endif
/* Update scheduler parameters. */
nxsched_switch_context(*running_task, tcb);
/* Record the new "running" task when context switch occurred.
* g_running_tasks[] is only used by assertion logic for reporting
* crashes.
*/
g_running_tasks[this_cpu()] = tcb;
*running_task = tcb;
}
/* If a context switch occurred while processing the interrupt then
arch/misoc/src/minerva/minerva_switchcontext.c
+1 -9
View File
@@ -59,10 +59,6 @@
void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
{
/* Update scheduler parameters */
nxsched_suspend_scheduler(rtcb);
/* Are we in an interrupt handler? */
if (up_current_regs())
@@ -73,10 +69,6 @@ void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
misoc_savestate(rtcb->xcp.regs);
/* Update scheduler parameters */
nxsched_resume_scheduler(tcb);
/* Then switch contexts. Any necessary address environment changes
* will be made when the interrupt returns.
*/
@@ -90,7 +82,7 @@ void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
{
/* Update scheduler parameters */
nxsched_resume_scheduler(tcb);
nxsched_switch_context(rtcb, tcb);
/* Then switch contexts */
arch/or1k/src/common/or1k_doirq.c
+4
View File
@@ -78,6 +78,10 @@ uint32_t *or1k_doirq(int irq, uint32_t *regs)
if (regs != up_current_regs())
{
/* Update scheduler parameters. */
nxsched_switch_context(*running_task, tcb);
/* Record the new "running" task when context switch occurred.
* g_running_tasks[] is only used by assertion logic for reporting
* crashes.
arch/or1k/src/common/or1k_switchcontext.c
+1 -9
View File
@@ -58,10 +58,6 @@
void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
{
/* Update scheduler parameters */
nxsched_suspend_scheduler(rtcb);
/* Are we in an interrupt handler? */
#if 0 /* REVISIT */
@@ -76,10 +72,6 @@ void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
or1k_savestate(rtcb->xcp.regs);
/* Update scheduler parameters */
nxsched_resume_scheduler(tcb);
/* Then switch contexts. Any necessary address environment
* changes will be made when the interrupt returns.
*/
@@ -106,7 +98,7 @@ void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
#endif
/* Update scheduler parameters */
nxsched_resume_scheduler(tcb);
nxsched_switch_context(rtcb, tcb);
/* Record the new "running" task */
arch/renesas/src/common/renesas_doirq.c
+4
View File
@@ -112,6 +112,10 @@ uint32_t *renesas_doirq(int irq, uint32_t * regs)
addrenv_switch(tcb);
#endif
/* Update scheduler parameters. */
nxsched_switch_context(*running_task, tcb);
/* Record the new "running" task when context switch occurred.
* g_running_tasks[] is only used by assertion logic for reporting
* crashes.
arch/renesas/src/common/renesas_switchcontext.c
+1 -9
View File
@@ -58,10 +58,6 @@
void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
{
/* Update scheduler parameters */
nxsched_suspend_scheduler(rtcb);
/* Are we in an interrupt handler? */
if (up_current_regs())
@@ -72,10 +68,6 @@ void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
renesas_savestate(rtcb->xcp.regs);
/* Update scheduler parameters */
nxsched_resume_scheduler(tcb);
/* Then switch contexts. Any necessary address environment
* changes will be made when the interrupt returns.
*/
@@ -102,7 +94,7 @@ void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
#endif
/* Update scheduler parameters */
nxsched_resume_scheduler(tcb);
nxsched_switch_context(rtcb, tcb);
/* Record the new "running" task */
arch/risc-v/src/common/riscv_doirq.c
+1 -6
View File
@@ -128,12 +128,7 @@ uintreg_t *riscv_doirq(int irq, uintreg_t *regs)
/* Update scheduler parameters */
if (!restore_context)
{
nxsched_suspend_scheduler(*running_task);
}
nxsched_resume_scheduler(tcb);
nxsched_switch_context(*running_task, tcb);
/* Record the new "running" task when context switch occurred.
* g_running_tasks[] is only used by assertion logic for reporting
arch/risc-v/src/common/riscv_switchcontext.c
+4
View File
@@ -80,6 +80,10 @@ void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
else
{
/* Update scheduler parameters */
nxsched_switch_context(rtcb, tcb);
/* Then switch contexts */
riscv_switchcontext();
arch/risc-v/src/common/supervisor/riscv_perform_syscall.c
+1 -3
View File
@@ -73,11 +73,9 @@ void *riscv_perform_syscall(uintreg_t *regs)
if (!restore_context)
{
nxsched_suspend_scheduler(*running_task);
nxsched_switch_context(*running_task, tcb);
}
nxsched_resume_scheduler(tcb);
/* Record the new "running" task. g_running_tasks[] is only used by
* assertion logic for reporting crashes.
*/
arch/sim/src/sim/sim_doirq.c
+7 -1
View File
@@ -83,12 +83,18 @@ void *sim_doirq(int irq, void *context)
if (regs != up_current_regs())
{
struct tcb_s *tcb = this_task();
/* Update scheduler parameters. */
nxsched_switch_context(*running_task, tcb);
/* Record the new "running" task when context switch occurred.
* g_running_tasks[] is only used by assertion logic for reporting
* crashes.
*/
*running_task = this_task();
*running_task = tcb;
}
regs = up_current_regs();
arch/sim/src/sim/sim_switchcontext.c
+1 -9
View File
@@ -60,10 +60,6 @@ void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
sinfo("Unblocking TCB=%p\n", tcb);
/* Update scheduler parameters */
nxsched_suspend_scheduler(rtcb);
/* Are we in an interrupt handler? */
if (up_interrupt_context())
@@ -74,10 +70,6 @@ void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
sim_savestate(rtcb->xcp.regs);
/* Update scheduler parameters */
nxsched_resume_scheduler(tcb);
/* Restore the cpu lock */
restore_critical_section(tcb, this_cpu());
@@ -101,7 +93,7 @@ void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
/* Update scheduler parameters */
nxsched_resume_scheduler(tcb);
nxsched_switch_context(rtcb, tcb);
/* Restore the cpu lock */
arch/sparc/src/sparc_v8/sparc_v8_doirq.c
+5 -1
View File
@@ -113,12 +113,16 @@ uint32_t *sparc_doirq(int irq, uint32_t *regs)
addrenv_switch(tcb);
#endif
/* Update scheduler parameters. */
nxsched_switch_context(*running_task, tcb);
/* Record the new "running" task when context switch occurred.
* g_running_tasks[] is only used by assertion logic for reporting
* crashes.
*/
g_running_tasks[this_cpu()] = tcb;
*running_task = tcb;
}
/* If a context switch occurred while processing the interrupt then
arch/sparc/src/sparc_v8/sparc_v8_switchcontext.c
+1 -9
View File
@@ -59,10 +59,6 @@
void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
{
/* Update scheduler parameters */
nxsched_suspend_scheduler(rtcb);
/* Are we in an interrupt handler? */
if (up_current_regs())
@@ -73,10 +69,6 @@ void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
sparc_savestate(rtcb->xcp.regs);
/* Update scheduler parameters */
nxsched_resume_scheduler(tcb);
/* Then switch contexts. Any necessary address environment
* changes will be made when the interrupt returns.
*/
@@ -90,7 +82,7 @@ void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
{
/* Update scheduler parameters */
nxsched_resume_scheduler(tcb);
nxsched_switch_context(rtcb, tcb);
/* Then switch contexts */
arch/tricore/src/common/tricore_doirq.c
+4
View File
@@ -99,6 +99,10 @@ IFX_INTERRUPT_INTERNAL(tricore_doirq, 0, 255)
addrenv_switch(tcb);
#endif
/* Update scheduler parameters */
nxsched_switch_context(*running_task, tcb);
/* Record the new "running" task when context switch occurred.
* g_running_tasks[] is only used by assertion logic for reporting
* crashes.
arch/tricore/src/common/tricore_switchcontext.c
+1 -9
View File
@@ -59,10 +59,6 @@
void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
{
/* Update scheduler parameters */
nxsched_suspend_scheduler(rtcb);
/* Are we in an interrupt handler? */
if (up_current_regs())
@@ -73,10 +69,6 @@ void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
tricore_savestate(rtcb->xcp.regs);
/* Update scheduler parameters */
nxsched_resume_scheduler(tcb);
/* Then switch contexts. Any necessary address environment
* changes will be made when the interrupt returns.
*/
@@ -90,7 +82,7 @@ void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
{
/* Update scheduler parameters */
nxsched_resume_scheduler(tcb);
nxsched_switch_context(rtcb, tcb);
/* Then switch contexts */
arch/x86/src/common/x86_switchcontext.c
+1 -9
View File
@@ -58,10 +58,6 @@
void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
{
/* Update scheduler parameters */
nxsched_suspend_scheduler(rtcb);
/* Are we in an interrupt handler? */
if (up_current_regs())
@@ -72,10 +68,6 @@ void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
x86_savestate(rtcb->xcp.regs);
/* Update scheduler parameters */
nxsched_resume_scheduler(tcb);
/* Then switch contexts. Any necessary address environment
* changes will be made when the interrupt returns.
*/
@@ -102,7 +94,7 @@ void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
#endif
/* Update scheduler parameters */
nxsched_resume_scheduler(tcb);
nxsched_switch_context(rtcb, tcb);
/* Record the new "running" task */
arch/x86/src/qemu/qemu_handlers.c
+1 -2
View File
@@ -125,8 +125,7 @@ static uint32_t *common_handler(int irq, uint32_t *regs)
/* Update scheduler parameters */
nxsched_suspend_scheduler(*running_task);
nxsched_resume_scheduler(tcb);
nxsched_switch_context(*running_task, tcb);
/* Record the new "running" task when context switch occurred.
* g_running_tasks[] is only used by assertion logic for reporting
arch/x86_64/src/common/x86_64_switchcontext.c
+5 -3
View File
@@ -84,6 +84,7 @@ void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
else if (!up_saveusercontext(rtcb->xcp.regs))
{
struct tcb_s **running_task;
cpu = this_cpu();
x86_64_restore_auxstate(tcb);
@@ -104,14 +105,15 @@ void up_switch_context(struct tcb_s *tcb, struct tcb_s *rtcb)
/* Update scheduler parameters */
nxsched_suspend_scheduler(g_running_tasks[cpu]);
nxsched_resume_scheduler(current_task(cpu));
running_task = &g_running_tasks[cpu];
tcb = current_task(cpu);
nxsched_switch_context(*running_task, tcb);
/* Record the new "running" task. g_running_tasks[] is only used by
* assertion logic for reporting crashes.
*/
g_running_tasks[cpu] = current_task(cpu);
*running_task = tcb;
/* Then switch contexts */
arch/x86_64/src/intel64/intel64_handlers.c
+1 -2
View File
@@ -106,8 +106,7 @@ static uint64_t *common_handler(int irq, uint64_t *regs)
/* Update scheduler parameters */
nxsched_suspend_scheduler(*running_task);
nxsched_resume_scheduler(tcb);
nxsched_switch_context(*running_task, tcb);
/* Record the new "running" task when context switch occurred.
* g_running_tasks[] is only used by assertion logic for reporting
arch/xtensa/src/common/xtensa_irqdispatch.c
+1 -2
View File
@@ -97,8 +97,7 @@ uint32_t *xtensa_irq_dispatch(int irq, uint32_t *regs)
/* Update scheduler parameters */
nxsched_suspend_scheduler(*running_task);
nxsched_resume_scheduler(tcb);
nxsched_switch_context(*running_task, tcb);
/* Record the new "running" task when context switch occurred.
* g_running_tasks[] is only used by assertion logic for reporting
arch/z16/src/common/z16_doirq.c
+7 -1
View File
@@ -92,12 +92,18 @@ FAR chipreg_t *z16_doirq(int irq, FAR chipreg_t *regs)
if (regs != up_current_regs())
{
struct tcb_s *tcb = this_task();
/* Update scheduler parameters. */
nxsched_switch_context(*running_task, tcb);
/* Record the new "running" task when context switch occurred.
* g_running_tasks[] is only used by assertion logic for reporting
* crashes.
*/
*running_task = this_task();
*running_task = tcb;
}
/* Restore the previous value of g_current_regs. NULL would indicate
arch/z16/src/common/z16_switchcontext.c
+1 -9
View File
@@ -58,10 +58,6 @@
void up_switch_context(FAR struct tcb_s *tcb, FAR struct tcb_s *rtcb)
{
/* Update scheduler parameters */
nxsched_suspend_scheduler(rtcb);
/* Are we in an interrupt handler? */
if (IN_INTERRUPT)
@@ -72,10 +68,6 @@ void up_switch_context(FAR struct tcb_s *tcb, FAR struct tcb_s *rtcb)
SAVE_IRQCONTEXT(rtcb);
/* Update scheduler parameters */
nxsched_resume_scheduler(tcb);
/* Then setup so that the context will be performed on exit
* from the interrupt.
*/
@@ -93,7 +85,7 @@ void up_switch_context(FAR struct tcb_s *tcb, FAR struct tcb_s *rtcb)
{
/* Update scheduler parameters */
nxsched_resume_scheduler(tcb);
nxsched_switch_context(rtcb, tcb);
/* Record the new "running" task */
arch/z80/src/common/z80_doirq.c
+4
View File
@@ -95,6 +95,10 @@ FAR chipreg_t *z80_doirq(uint8_t irq, FAR chipreg_t *regs)
addrenv_switch(tcb);
#endif
/* Update scheduler parameters */
nxsched_switch_context(*running_task, tcb);
/* Record the new "running" task when context switch occurred.
* g_running_tasks[] is only used by assertion logic for reporting
* crashes.
arch/z80/src/common/z80_switchcontext.c
+2 -9
View File
@@ -60,10 +60,6 @@
void up_switch_context(FAR struct tcb_s *tcb, FAR struct tcb_s *rtcb)
{
/* Update scheduler parameters */
nxsched_suspend_scheduler(rtcb);
/* Are we in an interrupt handler? */
if (IN_INTERRUPT())
@@ -74,10 +70,6 @@ void up_switch_context(FAR struct tcb_s *tcb, FAR struct tcb_s *rtcb)
SAVE_IRQCONTEXT(rtcb);
/* Update scheduler parameters */
nxsched_resume_scheduler(tcb);
/* Then setup so that the context will be performed on exit
* from the interrupt. Any necessary address environment
* changes will be made when the interrupt returns.
@@ -103,9 +95,10 @@ void up_switch_context(FAR struct tcb_s *tcb, FAR struct tcb_s *rtcb)
addrenv_switch(tcb);
#endif
/* Update scheduler parameters */
nxsched_resume_scheduler(tcb);
nxsched_switch_context(rtcb, tcb);
/* Record the new "running" task */