diff --git a/arch/arm/src/arm/up_doirq.c b/arch/arm/src/arm/up_doirq.c
index 4e8c5caa447..68c4c402237 100644
--- a/arch/arm/src/arm/up_doirq.c
+++ b/arch/arm/src/arm/up_doirq.c
@@ -118,7 +118,7 @@ void up_doirq(int irq, uint32_t *regs)
        * thread at the head of the ready-to-run list.
        */
 
-      (void)group_addrenv(rtcb);
+      (void)group_addrenv(NULL);
 #endif
     }
 #endif
diff --git a/arch/arm/src/armv7-a/arm_doirq.c b/arch/arm/src/armv7-a/arm_doirq.c
index eadfce76cca..ce175d7c1e9 100644
--- a/arch/arm/src/armv7-a/arm_doirq.c
+++ b/arch/arm/src/armv7-a/arm_doirq.c
@@ -118,7 +118,7 @@ uint32_t *arm_doirq(int irq, uint32_t *regs)
        * thread at the head of the ready-to-run list.
        */
 
-      (void)group_addrenv(rtcb);
+      (void)group_addrenv(NULL);
 #endif
     }
 #endif
diff --git a/arch/arm/src/dm320/dm320_decodeirq.c b/arch/arm/src/dm320/dm320_decodeirq.c
index 710a3e33629..7616fe91884 100644
--- a/arch/arm/src/dm320/dm320_decodeirq.c
+++ b/arch/arm/src/dm320/dm320_decodeirq.c
@@ -134,7 +134,7 @@ void up_decodeirq(uint32_t* regs)
                * thread at the head of the ready-to-run list.
                */
 
-              (void)group_addrenv(rtcb);
+              (void)group_addrenv(NULL);
 #endif
             }
 #endif
diff --git a/arch/arm/src/imx/imx_decodeirq.c b/arch/arm/src/imx/imx_decodeirq.c
index 588795068be..e241ae39324 100644
--- a/arch/arm/src/imx/imx_decodeirq.c
+++ b/arch/arm/src/imx/imx_decodeirq.c
@@ -141,7 +141,7 @@ void up_decodeirq(uint32_t* regs)
                * thread at the head of the ready-to-run list.
                */
 
-              (void)group_addrenv(rtcb);
+              (void)group_addrenv(NULL);
 #endif
             }
 #endif
diff --git a/arch/arm/src/lpc31xx/lpc31_decodeirq.c b/arch/arm/src/lpc31xx/lpc31_decodeirq.c
index 28aa2a131f6..355f13af3f7 100644
--- a/arch/arm/src/lpc31xx/lpc31_decodeirq.c
+++ b/arch/arm/src/lpc31xx/lpc31_decodeirq.c
@@ -1,6 +1,5 @@
 /********************************************************************************
  * arch/arm/src/lpc31xx/lpc31_decodeirq.c
- * arch/arm/src/chip/lpc31_decodeirq.c
  *
  *   Copyright (C) 2009, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -142,7 +141,7 @@ void up_decodeirq(uint32_t *regs)
                * thread at the head of the ready-to-run list.
                */
 
-              (void)group_addrenv(rtcb);
+              (void)group_addrenv(NULL);
 #endif
             }
 #endif
diff --git a/arch/avr/src/avr32/up_doirq.c b/arch/avr/src/avr32/up_doirq.c
index f7e7a759fb2..242c8628911 100644
--- a/arch/avr/src/avr32/up_doirq.c
+++ b/arch/avr/src/avr32/up_doirq.c
@@ -113,7 +113,7 @@ uint32_t *up_doirq(int irq, uint32_t *regs)
        * thread at the head of the ready-to-run list.
        */
 
-      (void)group_addrenv(rtcb);
+      (void)group_addrenv(NULL);
 #endif
     }
 #endif
diff --git a/arch/hc/src/common/up_doirq.c b/arch/hc/src/common/up_doirq.c
index 047b04508be..3ddedf27af7 100644
--- a/arch/hc/src/common/up_doirq.c
+++ b/arch/hc/src/common/up_doirq.c
@@ -113,7 +113,7 @@ uint8_t *up_doirq(int irq, uint8_t *regs)
        * thread at the head of the ready-to-run list.
        */
 
-      (void)group_addrenv(rtcb);
+      (void)group_addrenv(NULL);
 #endif
     }
 #endif
diff --git a/arch/mips/src/mips32/up_doirq.c b/arch/mips/src/mips32/up_doirq.c
index 6abba7d75bd..b5ca41974b6 100644
--- a/arch/mips/src/mips32/up_doirq.c
+++ b/arch/mips/src/mips32/up_doirq.c
@@ -119,7 +119,7 @@ uint32_t *up_doirq(int irq, uint32_t *regs)
        * thread at the head of the ready-to-run list.
        */
 
-      (void)group_addrenv(rtcb);
+      (void)group_addrenv(NULL);
 #endif
     }
 #endif
diff --git a/arch/mips/src/pic32mx/pic32mx-decodeirq.c b/arch/mips/src/pic32mx/pic32mx-decodeirq.c
index 650e6851cf1..661e4c6c10d 100644
--- a/arch/mips/src/pic32mx/pic32mx-decodeirq.c
+++ b/arch/mips/src/pic32mx/pic32mx-decodeirq.c
@@ -170,7 +170,7 @@ uint32_t *pic32mx_decodeirq(uint32_t *regs)
        * thread at the head of the ready-to-run list.
        */
 
-      (void)group_addrenv(rtcb);
+      (void)group_addrenv(NULL);
 #endif
     }
 #endif
diff --git a/arch/sh/src/common/up_doirq.c b/arch/sh/src/common/up_doirq.c
index ca6c6ee598d..ec165dcd093 100644
--- a/arch/sh/src/common/up_doirq.c
+++ b/arch/sh/src/common/up_doirq.c
@@ -121,7 +121,7 @@ uint32_t *up_doirq(int irq, uint32_t* regs)
            * thread at the head of the ready-to-run list.
            */
 
-          (void)group_addrenv(rtcb);
+          (void)group_addrenv(NULL);
 #endif
         }
 #endif
diff --git a/arch/x86/src/qemu/qemu_handlers.c b/arch/x86/src/qemu/qemu_handlers.c
index ddccfa359e5..1c7ba1fb8a0 100644
--- a/arch/x86/src/qemu/qemu_handlers.c
+++ b/arch/x86/src/qemu/qemu_handlers.c
@@ -125,7 +125,7 @@ static uint32_t *common_handler(int irq, uint32_t *regs)
        * thread at the head of the ready-to-run list.
        */
 
-      (void)group_addrenv(rtcb);
+      (void)group_addrenv(NULL);
 #endif
     }
 #endif
diff --git a/arch/z80/src/common/up_doirq.c b/arch/z80/src/common/up_doirq.c
index ab974c88a19..caa03ea9a4a 100644
--- a/arch/z80/src/common/up_doirq.c
+++ b/arch/z80/src/common/up_doirq.c
@@ -112,7 +112,7 @@ FAR chipreg_t *up_doirq(uint8_t irq, FAR chipreg_t *regs)
            * ready-to-run list.
            */
 
-          (void)group_addrenv(rtcb);
+          (void)group_addrenv(NULL);
         }
 
       regs = newregs;