diff --git a/arch/arm/src/arm/arm_reprioritizertr.c b/arch/arm/src/arm/arm_reprioritizertr.c
index 50970cce5a9..6d5cb0ca7bf 100644
--- a/arch/arm/src/arm/arm_reprioritizertr.c
+++ b/arch/arm/src/arm/arm_reprioritizertr.c
@@ -51,8 +51,7 @@
  *   1) The priority of the currently running task drops and the next
  *      task in the ready to run list has priority.
  *   2) An idle, ready to run task's priority has been raised above the
- *      the priority of the current, running task and it now has the
- *      priority.
+ *      priority of the current, running task and it now has the priority.
  *
  * Input Parameters:
  *   tcb: The TCB of the task that has been reprioritized
@@ -110,7 +109,6 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
         {
           /* If we are going to do a context switch, then now is the right
            * time to add any pending tasks back into the ready-to-run list.
-           * task list now
            */
 
           if (g_pendingtasks.head)
diff --git a/arch/arm/src/armv6-m/arm_reprioritizertr.c b/arch/arm/src/armv6-m/arm_reprioritizertr.c
index e22faeedae6..c545a0030fb 100644
--- a/arch/arm/src/armv6-m/arm_reprioritizertr.c
+++ b/arch/arm/src/armv6-m/arm_reprioritizertr.c
@@ -50,8 +50,7 @@
  *   1) The priority of the currently running task drops and the next
  *      task in the ready to run list has priority.
  *   2) An idle, ready to run task's priority has been raised above the
- *      the priority of the current, running task and it now has the
- *      priority.
+ *      priority of the current, running task and it now has the priority.
  *
  * Input Parameters:
  *   tcb: The TCB of the task that has been reprioritized
@@ -111,7 +110,6 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
         {
           /* If we are going to do a context switch, then now is the right
            * time to add any pending tasks back into the ready-to-run list.
-           * task list now
            */
 
           if (g_pendingtasks.head)
diff --git a/arch/arm/src/armv7-a/arm_reprioritizertr.c b/arch/arm/src/armv7-a/arm_reprioritizertr.c
index 1cd6ff38d0a..12831e3b627 100644
--- a/arch/arm/src/armv7-a/arm_reprioritizertr.c
+++ b/arch/arm/src/armv7-a/arm_reprioritizertr.c
@@ -51,8 +51,7 @@
  *   1) The priority of the currently running task drops and the next
  *      task in the ready to run list has priority.
  *   2) An idle, ready to run task's priority has been raised above the
- *      the priority of the current, running task and it now has the
- *      priority.
+ *      priority of the current, running task and it now has the priority.
  *
  * Input Parameters:
  *   tcb: The TCB of the task that has been reprioritized
@@ -110,7 +109,6 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
         {
           /* If we are going to do a context switch, then now is the right
            * time to add any pending tasks back into the ready-to-run list.
-           * task list now
            */
 
           if (g_pendingtasks.head)
diff --git a/arch/arm/src/armv7-m/arm_reprioritizertr.c b/arch/arm/src/armv7-m/arm_reprioritizertr.c
index a3373553f9e..4dbe8f27b3c 100644
--- a/arch/arm/src/armv7-m/arm_reprioritizertr.c
+++ b/arch/arm/src/armv7-m/arm_reprioritizertr.c
@@ -50,8 +50,7 @@
  *   1) The priority of the currently running task drops and the next
  *      task in the ready to run list has priority.
  *   2) An idle, ready to run task's priority has been raised above the
- *      the priority of the current, running task and it now has the
- *      priority.
+ *      priority of the current, running task and it now has the priority.
  *
  * Input Parameters:
  *   tcb: The TCB of the task that has been reprioritized
@@ -111,7 +110,6 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
         {
           /* If we are going to do a context switch, then now is the right
            * time to add any pending tasks back into the ready-to-run list.
-           * task list now
            */
 
           if (g_pendingtasks.head)
diff --git a/arch/arm/src/armv7-r/arm_reprioritizertr.c b/arch/arm/src/armv7-r/arm_reprioritizertr.c
index f664dcd26fa..44c41b6b1de 100644
--- a/arch/arm/src/armv7-r/arm_reprioritizertr.c
+++ b/arch/arm/src/armv7-r/arm_reprioritizertr.c
@@ -51,8 +51,7 @@
  *   1) The priority of the currently running task drops and the next
  *      task in the ready to run list has priority.
  *   2) An idle, ready to run task's priority has been raised above the
- *      the priority of the current, running task and it now has the
- *      priority.
+ *      priority of the current, running task and it now has the priority.
  *
  * Input Parameters:
  *   tcb: The TCB of the task that has been reprioritized
@@ -110,7 +109,6 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
         {
           /* If we are going to do a context switch, then now is the right
            * time to add any pending tasks back into the ready-to-run list.
-           * task list now
            */
 
           if (g_pendingtasks.head)
diff --git a/arch/arm/src/armv8-m/arm_reprioritizertr.c b/arch/arm/src/armv8-m/arm_reprioritizertr.c
index 13c3f0264e7..e7f0a2219e7 100644
--- a/arch/arm/src/armv8-m/arm_reprioritizertr.c
+++ b/arch/arm/src/armv8-m/arm_reprioritizertr.c
@@ -50,8 +50,7 @@
  *   1) The priority of the currently running task drops and the next
  *      task in the ready to run list has priority.
  *   2) An idle, ready to run task's priority has been raised above the
- *      the priority of the current, running task and it now has the
- *      priority.
+ *      priority of the current, running task and it now has the priority.
  *
  * Input Parameters:
  *   tcb: The TCB of the task that has been reprioritized
@@ -111,7 +110,6 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
         {
           /* If we are going to do a context switch, then now is the right
            * time to add any pending tasks back into the ready-to-run list.
-           * task list now
            */
 
           if (g_pendingtasks.head)
diff --git a/arch/avr/src/avr/up_reprioritizertr.c b/arch/avr/src/avr/up_reprioritizertr.c
index c876b2a3918..7bf1565e963 100644
--- a/arch/avr/src/avr/up_reprioritizertr.c
+++ b/arch/avr/src/avr/up_reprioritizertr.c
@@ -50,8 +50,7 @@
  *   1) The priority of the currently running task drops and the next
  *      task in the ready to run list has priority.
  *   2) An idle, ready to run task's priority has been raised above the
- *      the priority of the current, running task and it now has the
- *      priority.
+ *      priority of the current, running task and it now has the priority.
  *
  * Input Parameters:
  *   tcb: The TCB of the task that has been reprioritized
@@ -109,7 +108,6 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
         {
           /* If we are going to do a context switch, then now is the right
            * time to add any pending tasks back into the ready-to-run list.
-           * task list now
            */
 
           if (g_pendingtasks.head)
diff --git a/arch/avr/src/avr32/up_reprioritizertr.c b/arch/avr/src/avr32/up_reprioritizertr.c
index a3d26a4d359..ccc3bf431cc 100644
--- a/arch/avr/src/avr32/up_reprioritizertr.c
+++ b/arch/avr/src/avr32/up_reprioritizertr.c
@@ -51,8 +51,7 @@
  *   1) The priority of the currently running task drops and the next
  *      task in the ready to run list has priority.
  *   2) An idle, ready to run task's priority has been raised above the
- *      the priority of the current, running task and it now has the
- *      priority.
+ *      priority of the current, running task and it now has the priority.
  *
  * Input Parameters:
  *   tcb: The TCB of the task that has been reprioritized
@@ -110,7 +109,6 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
         {
           /* If we are going to do a context switch, then now is the right
            * time to add any pending tasks back into the ready-to-run list.
-           * task list now
            */
 
           if (g_pendingtasks.head)
diff --git a/arch/hc/src/common/up_reprioritizertr.c b/arch/hc/src/common/up_reprioritizertr.c
index bdd111f8481..04f074fa84a 100644
--- a/arch/hc/src/common/up_reprioritizertr.c
+++ b/arch/hc/src/common/up_reprioritizertr.c
@@ -51,8 +51,7 @@
  *   1) The priority of the currently running task drops and the next
  *      task in the ready to run list has priority.
  *   2) An idle, ready to run task's priority has been raised above the
- *      the priority of the current, running task and it now has the
- *      priority.
+ *      priority of the current, running task and it now has the priority.
  *
  * Input Parameters:
  *   tcb: The TCB of the task that has been reprioritized
@@ -110,7 +109,6 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
         {
           /* If we are going to do a context switch, then now is the right
            * time to add any pending tasks back into the ready-to-run list.
-           * task list now
            */
 
           if (g_pendingtasks.head)
diff --git a/arch/mips/src/mips32/mips_reprioritizertr.c b/arch/mips/src/mips32/mips_reprioritizertr.c
index f5088c51071..5d04a586388 100644
--- a/arch/mips/src/mips32/mips_reprioritizertr.c
+++ b/arch/mips/src/mips32/mips_reprioritizertr.c
@@ -53,8 +53,7 @@
  *   1) The priority of the currently running task drops and the next
  *      task in the ready to run list has priority.
  *   2) An idle, ready to run task's priority has been raised above the
- *      the priority of the current, running task and it now has the
- *      priority.
+ *      priority of the current, running task and it now has the priority.
  *
  * Input Parameters:
  *   tcb: The TCB of the task that has been reprioritized
@@ -112,7 +111,6 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
         {
           /* If we are going to do a context switch, then now is the right
            * time to add any pending tasks back into the ready-to-run list.
-           * task list now
            */
 
           if (g_pendingtasks.head)
diff --git a/arch/misoc/src/lm32/lm32_reprioritizertr.c b/arch/misoc/src/lm32/lm32_reprioritizertr.c
index 11c5cc7f1a8..5203abe962c 100644
--- a/arch/misoc/src/lm32/lm32_reprioritizertr.c
+++ b/arch/misoc/src/lm32/lm32_reprioritizertr.c
@@ -53,8 +53,7 @@
  *   1) The priority of the currently running task drops and the next
  *      task in the ready to run list has priority.
  *   2) An idle, ready to run task's priority has been raised above the
- *      the priority of the current, running task and it now has the
- *      priority.
+ *      priority of the current, running task and it now has the priority.
  *
  * Input Parameters:
  *   tcb: The TCB of the task that has been reprioritized
@@ -112,7 +111,6 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
         {
           /* If we are going to do a context switch, then now is the right
            * time to add any pending tasks back into the ready-to-run list.
-           * task list now
            */
 
           if (g_pendingtasks.head)
diff --git a/arch/misoc/src/minerva/minerva_reprioritizertr.c b/arch/misoc/src/minerva/minerva_reprioritizertr.c
index 565d3ffdf01..fcd1b0d3ab1 100644
--- a/arch/misoc/src/minerva/minerva_reprioritizertr.c
+++ b/arch/misoc/src/minerva/minerva_reprioritizertr.c
@@ -53,8 +53,7 @@
  *   1) The priority of the currently running task drops and the next
  *      task in the ready to run list has priority.
  *   2) An idle, ready to run task's priority has been raised above the
- *      the priority of the current, running task and it now has the
- *      priority.
+ *      priority of the current, running task and it now has the priority.
  *
  * Input Parameters:
  *   tcb: The TCB of the task that has been reprioritized
@@ -110,8 +109,7 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
       if (switch_needed)
         {
           /* If we are going to do a context switch, then now is the right
-           * time to add any pending tasks back into the ready-to-run list
-           * task list now.
+           * time to add any pending tasks back into the ready-to-run list.
            */
 
           if (g_pendingtasks.head)
diff --git a/arch/or1k/src/common/up_reprioritizertr.c b/arch/or1k/src/common/up_reprioritizertr.c
index bf22ea41a7b..2a7c315b4af 100644
--- a/arch/or1k/src/common/up_reprioritizertr.c
+++ b/arch/or1k/src/common/up_reprioritizertr.c
@@ -51,8 +51,7 @@
  *   1) The priority of the currently running task drops and the next
  *      task in the ready to run list has priority.
  *   2) An idle, ready to run task's priority has been raised above the
- *      the priority of the current, running task and it now has the
- *      priority.
+ *      priority of the current, running task and it now has the priority.
  *
  * Input Parameters:
  *   tcb: The TCB of the task that has been reprioritized
@@ -110,7 +109,6 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
         {
           /* If we are going to do a context switch, then now is the right
            * time to add any pending tasks back into the ready-to-run list.
-           * task list now
            */
 
           if (g_pendingtasks.head)
diff --git a/arch/renesas/src/common/up_reprioritizertr.c b/arch/renesas/src/common/up_reprioritizertr.c
index 75d3fcf9eb8..c0f03925fa3 100644
--- a/arch/renesas/src/common/up_reprioritizertr.c
+++ b/arch/renesas/src/common/up_reprioritizertr.c
@@ -51,8 +51,7 @@
  *   1) The priority of the currently running task drops and the next
  *      task in the ready to run list has priority.
  *   2) An idle, ready to run task's priority has been raised above the
- *      the priority of the current, running task and it now has the
- *      priority.
+ *      priority of the current, running task and it now has the priority.
  *
  * Input Parameters:
  *   tcb: The TCB of the task that has been reprioritized
@@ -110,7 +109,6 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
         {
           /* If we are going to do a context switch, then now is the right
            * time to add any pending tasks back into the ready-to-run list.
-           * task list now
            */
 
           if (g_pendingtasks.head)
diff --git a/arch/risc-v/src/rv32im/riscv_reprioritizertr.c b/arch/risc-v/src/rv32im/riscv_reprioritizertr.c
index bfff454995a..3b2d4c8f5a5 100644
--- a/arch/risc-v/src/rv32im/riscv_reprioritizertr.c
+++ b/arch/risc-v/src/rv32im/riscv_reprioritizertr.c
@@ -53,8 +53,7 @@
  *   1) The priority of the currently running task drops and the next
  *      task in the ready to run list has priority.
  *   2) An idle, ready to run task's priority has been raised above the
- *      the priority of the current, running task and it now has the
- *      priority.
+ *      priority of the current, running task and it now has the priority.
  *
  * Input Parameters:
  *   tcb: The TCB of the task that has been reprioritized
@@ -112,7 +111,6 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
         {
           /* If we are going to do a context switch, then now is the right
            * time to add any pending tasks back into the ready-to-run list.
-           * task list now
            */
 
           if (g_pendingtasks.head)
diff --git a/arch/risc-v/src/rv64gc/riscv_reprioritizertr.c b/arch/risc-v/src/rv64gc/riscv_reprioritizertr.c
index 974bf5ced99..8cf0b825105 100644
--- a/arch/risc-v/src/rv64gc/riscv_reprioritizertr.c
+++ b/arch/risc-v/src/rv64gc/riscv_reprioritizertr.c
@@ -53,8 +53,7 @@
  *   1) The priority of the currently running task drops and the next
  *      task in the ready to run list has priority.
  *   2) An idle, ready to run task's priority has been raised above the
- *      the priority of the current, running task and it now has the
- *      priority.
+ *      priority of the current, running task and it now has the priority.
  *
  * Input Parameters:
  *   tcb: The TCB of the task that has been reprioritized
@@ -112,7 +111,6 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
         {
           /* If we are going to do a context switch, then now is the right
            * time to add any pending tasks back into the ready-to-run list.
-           * task list now
            */
 
           if (g_pendingtasks.head)
diff --git a/arch/sim/src/sim/up_reprioritizertr.c b/arch/sim/src/sim/up_reprioritizertr.c
index 08aadfd1019..5b3a23228a9 100644
--- a/arch/sim/src/sim/up_reprioritizertr.c
+++ b/arch/sim/src/sim/up_reprioritizertr.c
@@ -51,8 +51,7 @@
  *   1) The priority of the currently running task drops and the next
  *      task in the ready to run list has priority.
  *   2) An idle, ready to run task's priority has been raised above the
- *      the priority of the current, running task and it now has the
- *      priority.
+ *      priority of the current, running task and it now has the priority.
  *
  * Input Parameters:
  *   tcb: The TCB of the task that has been reprioritized
@@ -110,7 +109,6 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
         {
           /* If we are going to do a context switch, then now is the right
            * time to add any pending tasks back into the ready-to-run list.
-           * task list now
            */
 
           if (g_pendingtasks.head)
diff --git a/arch/x86/src/common/up_reprioritizertr.c b/arch/x86/src/common/up_reprioritizertr.c
index 0a2c2134187..7442508078a 100644
--- a/arch/x86/src/common/up_reprioritizertr.c
+++ b/arch/x86/src/common/up_reprioritizertr.c
@@ -51,8 +51,7 @@
  *   1) The priority of the currently running task drops and the next
  *      task in the ready to run list has priority.
  *   2) An idle, ready to run task's priority has been raised above the
- *      the priority of the current, running task and it now has the
- *      priority.
+ *      priority of the current, running task and it now has the priority.
  *
  * Input Parameters:
  *   tcb: The TCB of the task that has been reprioritized
@@ -110,7 +109,6 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
         {
           /* If we are going to do a context switch, then now is the right
            * time to add any pending tasks back into the ready-to-run list.
-           * task list now
            */
 
           if (g_pendingtasks.head)
diff --git a/arch/x86_64/src/common/up_reprioritizertr.c b/arch/x86_64/src/common/up_reprioritizertr.c
index 426a184ab25..c9461a187c7 100644
--- a/arch/x86_64/src/common/up_reprioritizertr.c
+++ b/arch/x86_64/src/common/up_reprioritizertr.c
@@ -51,8 +51,7 @@
  *   1) The priority of the currently running task drops and the next
  *      task in the ready to run list has priority.
  *   2) An idle, ready to run task's priority has been raised above the
- *      the priority of the current, running task and it now has the
- *      priority.
+ *      priority of the current, running task and it now has the priority.
  *
  * Input Parameters:
  *   tcb: The TCB of the task that has been reprioritized
@@ -110,7 +109,6 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
         {
           /* If we are going to do a context switch, then now is the right
            * time to add any pending tasks back into the ready-to-run list.
-           * task list now
            */
 
           if (g_pendingtasks.head)
diff --git a/arch/xtensa/src/common/xtensa_reprioritizertr.c b/arch/xtensa/src/common/xtensa_reprioritizertr.c
index ba100bd834a..760a1c2bc56 100644
--- a/arch/xtensa/src/common/xtensa_reprioritizertr.c
+++ b/arch/xtensa/src/common/xtensa_reprioritizertr.c
@@ -53,8 +53,7 @@
  *   1) The priority of the currently running task drops and the next
  *      task in the ready to run list has priority.
  *   2) An idle, ready to run task's priority has been raised above the
- *      the priority of the current, running task and it now has the
- *      priority.
+ *      priority of the current, running task and it now has the priority.
  *
  * Input Parameters:
  *   tcb: The TCB of the task that has been reprioritized
@@ -112,7 +111,6 @@ void up_reprioritize_rtr(struct tcb_s *tcb, uint8_t priority)
         {
           /* If we are going to do a context switch, then now is the right
            * time to add any pending tasks back into the ready-to-run list.
-           * task list now
            */
 
           if (g_pendingtasks.head)
diff --git a/arch/z16/src/common/z16_reprioritizertr.c b/arch/z16/src/common/z16_reprioritizertr.c
index c688493d741..15a9124b7ad 100644
--- a/arch/z16/src/common/z16_reprioritizertr.c
+++ b/arch/z16/src/common/z16_reprioritizertr.c
@@ -52,8 +52,7 @@
  *   1) The priority of the currently running task drops and the next
  *      task in the ready to run list has priority.
  *   2) An idle, ready to run task's priority has been raised above the
- *      the priority of the current, running task and it now has the
- *      priority.
+ *      priority of the current, running task and it now has the priority.
  *
  * Input Parameters:
  *   tcb: The TCB of the task that has been reprioritized
@@ -111,7 +110,6 @@ void up_reprioritize_rtr(FAR struct tcb_s *tcb, uint8_t priority)
         {
           /* If we are going to do a context switch, then now is the right
            * time to add any pending tasks back into the ready-to-run list.
-           * task list now
            */
 
           if (g_pendingtasks.head)
diff --git a/arch/z80/src/common/z80_reprioritizertr.c b/arch/z80/src/common/z80_reprioritizertr.c
index fe8ba0e8452..5ceb2ca57d1 100644
--- a/arch/z80/src/common/z80_reprioritizertr.c
+++ b/arch/z80/src/common/z80_reprioritizertr.c
@@ -54,8 +54,7 @@
  *   1) The priority of the currently running task drops and the next
  *      task in the ready to run list has priority.
  *   2) An idle, ready to run task's priority has been raised above the
- *      the priority of the current, running task and it now has the
- *      priority.
+ *      priority of the current, running task and it now has the priority.
  *
  * Input Parameters:
  *   tcb: The TCB of the task that has been reprioritized
@@ -113,7 +112,6 @@ void up_reprioritize_rtr(FAR struct tcb_s *tcb, uint8_t priority)
         {
           /* If we are going to do a context switch, then now is the right
            * time to add any pending tasks back into the ready-to-run list.
-           * task list now
            */
 
           if (g_pendingtasks.head)
diff --git a/include/nuttx/arch.h b/include/nuttx/arch.h
index fab214abbb1..42e2dfeb0b6 100644
--- a/include/nuttx/arch.h
+++ b/include/nuttx/arch.h
@@ -449,8 +449,7 @@ void up_release_pending(void);
  *   1) The priority of the currently running task drops and the next
  *      task in the ready to run list has priority.
  *   2) An idle, ready to run task's priority has been raised above the
- *      the priority of the current, running task and it now has the
- *      priority.
+ *      priority of the current, running task and it now has the priority.
  *
  *   This function is called only from the NuttX scheduling
  *   logic.  Interrupts will always be disabled when this