diff --git a/arch/arm/include/irq.h b/arch/arm/include/irq.h
index 69b47a3da1..21e221816b 100644
--- a/arch/arm/include/irq.h
+++ b/arch/arm/include/irq.h
@@ -83,7 +83,7 @@ extern "C"
  ****************************************************************************/
 
 /* g_current_regs[] holds a references to the current interrupt level
- * register storage structure.  If is non-NULL only during interrupt
+ * register storage structure.  It is non-NULL only during interrupt
  * processing.  Access to g_current_regs[] must be through the macro
  * CURRENT_REGS for portability.
  */
diff --git a/arch/arm64/include/irq.h b/arch/arm64/include/irq.h
index ffba10d75a..56ac7278a8 100644
--- a/arch/arm64/include/irq.h
+++ b/arch/arm64/include/irq.h
@@ -207,7 +207,7 @@ extern "C"
  ****************************************************************************/
 
 /* g_current_regs[] holds a references to the current interrupt level
- * register storage structure.  If is non-NULL only during interrupt
+ * register storage structure.  It is non-NULL only during interrupt
  * processing.  Access to g_current_regs[] must be through the macro
  * CURRENT_REGS for portability.
  */
diff --git a/arch/avr/include/irq.h b/arch/avr/include/irq.h
index 60cd9197a0..3b6ba6793e 100644
--- a/arch/avr/include/irq.h
+++ b/arch/avr/include/irq.h
@@ -74,7 +74,7 @@ extern "C"
 
 #ifndef __ASSEMBLY__
 /* This holds a references to the current interrupt level register storage
- * structure.  If is non-NULL only during interrupt processing.
+ * structure.  It is non-NULL only during interrupt processing.
  */
 
 #ifdef CONFIG_ARCH_FAMILY_AVR32
diff --git a/arch/ceva/include/irq.h b/arch/ceva/include/irq.h
index 36e9c63940..8762b1e790 100644
--- a/arch/ceva/include/irq.h
+++ b/arch/ceva/include/irq.h
@@ -94,7 +94,7 @@ extern "C"
 #endif
 
 /* g_current_regs[] holds a references to the current interrupt level
- * register storage structure.  If is non-NULL only during interrupt
+ * register storage structure.  It is non-NULL only during interrupt
  * processing.  Access to g_current_regs[] must be through the macro
  * CURRENT_REGS for portability.
  */
diff --git a/arch/hc/include/irq.h b/arch/hc/include/irq.h
index 01d604548b..a4736e0b44 100644
--- a/arch/hc/include/irq.h
+++ b/arch/hc/include/irq.h
@@ -91,7 +91,7 @@ static inline uint16_t up_getsp(void)
  ****************************************************************************/
 
 /* This holds a references to the current interrupt level register storage
- * structure.  If is non-NULL only during interrupt processing.
+ * structure.  It is non-NULL only during interrupt processing.
  */
 
 EXTERN volatile uint8_t *g_current_regs;
diff --git a/arch/misoc/include/irq.h b/arch/misoc/include/irq.h
index ea5d6f9592..d2ebb92f03 100644
--- a/arch/misoc/include/irq.h
+++ b/arch/misoc/include/irq.h
@@ -77,7 +77,7 @@ static inline uint32_t up_getsp(void)
  ****************************************************************************/
 
 /* This holds a references to the current interrupt level register storage
- * structure.  If is non-NULL only during interrupt processing.
+ * structure.  It is non-NULL only during interrupt processing.
  */
 
 EXTERN volatile uint32_t *g_current_regs;
diff --git a/arch/or1k/include/irq.h b/arch/or1k/include/irq.h
index 11b0857cdf..8a22a21039 100644
--- a/arch/or1k/include/irq.h
+++ b/arch/or1k/include/irq.h
@@ -75,7 +75,7 @@ extern "C"
 #endif
 
 /* g_current_regs[] holds a references to the current interrupt level
- * register storage structure.  If is non-NULL only during interrupt
+ * register storage structure.  It is non-NULL only during interrupt
  * processing.  Access to g_current_regs[] must be through the macro
  * CURRENT_REGS for portability.
  */
diff --git a/arch/renesas/include/irq.h b/arch/renesas/include/irq.h
index c0c2c919ba..a85c534abb 100644
--- a/arch/renesas/include/irq.h
+++ b/arch/renesas/include/irq.h
@@ -59,7 +59,7 @@ extern "C"
  ****************************************************************************/
 
 /* This holds a references to the current interrupt level
- * register storage structure.  If is non-NULL only during
+ * register storage structure.  It is non-NULL only during
  * interrupt processing.
  */
 
diff --git a/arch/risc-v/include/irq.h b/arch/risc-v/include/irq.h
index 4be5c124f4..c55458692f 100644
--- a/arch/risc-v/include/irq.h
+++ b/arch/risc-v/include/irq.h
@@ -620,7 +620,7 @@ extern "C"
 #endif
 
 /* g_current_regs[] holds a references to the current interrupt level
- * register storage structure.  If is non-NULL only during interrupt
+ * register storage structure.  It is non-NULL only during interrupt
  * processing.  Access to g_current_regs[] must be through the macro
  * CURRENT_REGS for portability.
  */
diff --git a/arch/sim/include/irq.h b/arch/sim/include/irq.h
index e5474e15fa..86bbe79409 100644
--- a/arch/sim/include/irq.h
+++ b/arch/sim/include/irq.h
@@ -68,7 +68,7 @@ extern "C"
  ****************************************************************************/
 
 /* g_current_regs[] holds a references to the current interrupt level
- * register storage structure.  If is non-NULL only during interrupt
+ * register storage structure.  It is non-NULL only during interrupt
  * processing.  Access to g_current_regs[] must be through the macro
  * CURRENT_REGS for portability.
  */
diff --git a/arch/sparc/include/irq.h b/arch/sparc/include/irq.h
index 2378b657ec..b4f2eb8a61 100644
--- a/arch/sparc/include/irq.h
+++ b/arch/sparc/include/irq.h
@@ -93,7 +93,7 @@ static inline uint32_t up_getsp(void)
  ****************************************************************************/
 
 /* g_current_regs[] holds a references to the current interrupt level
- * register storage structure.  If is non-NULL only during interrupt
+ * register storage structure.  It is non-NULL only during interrupt
  * processing.  Access to g_current_regs[] must be through the macro
  * CURRENT_REGS for portability.
  */
diff --git a/arch/tricore/include/irq.h b/arch/tricore/include/irq.h
index 8e2f20f658..e8fa9b7786 100644
--- a/arch/tricore/include/irq.h
+++ b/arch/tricore/include/irq.h
@@ -61,7 +61,7 @@ extern "C"
  ****************************************************************************/
 
 /* g_current_regs[] holds a references to the current interrupt level
- * register storage structure.  If is non-NULL only during interrupt
+ * register storage structure.  It is non-NULL only during interrupt
  * processing.  Access to g_current_regs[] must be through the macro
  * CURRENT_REGS for portability.
  */
diff --git a/arch/x86/include/irq.h b/arch/x86/include/irq.h
index a29002974f..e38787a8dc 100644
--- a/arch/x86/include/irq.h
+++ b/arch/x86/include/irq.h
@@ -76,7 +76,7 @@ extern "C"
 
 #ifndef __ASSEMBLY__
 /* This holds a references to the current interrupt level register storage
- * structure.  If is non-NULL only during interrupt processing.
+ * structure.  It is non-NULL only during interrupt processing.
  */
 
 EXTERN volatile uint32_t *g_current_regs;
diff --git a/arch/x86_64/include/irq.h b/arch/x86_64/include/irq.h
index 80994301be..2e1e81fe5c 100644
--- a/arch/x86_64/include/irq.h
+++ b/arch/x86_64/include/irq.h
@@ -59,7 +59,7 @@
 
 #ifndef __ASSEMBLY__
 /* This holds a references to the current interrupt level register storage
- * structure.  If is non-NULL only during interrupt processing.
+ * structure.  It is non-NULL only during interrupt processing.
  */
 
 extern volatile uint64_t *g_current_regs;
diff --git a/arch/xtensa/include/irq.h b/arch/xtensa/include/irq.h
index ece60779f7..f5c71856b6 100644
--- a/arch/xtensa/include/irq.h
+++ b/arch/xtensa/include/irq.h
@@ -367,7 +367,7 @@ extern "C"
 
 #ifndef __ASSEMBLY__
 /* g_current_regs[] holds a references to the current interrupt level
- * register storage structure.  If is non-NULL only during interrupt
+ * register storage structure.  It is non-NULL only during interrupt
  * processing.  Access to g_current_regs[] must be through the macro
  * CURRENT_REGS for portability.
  */
diff --git a/arch/z16/include/irq.h b/arch/z16/include/irq.h
index c153db2448..37b5fbcb90 100644
--- a/arch/z16/include/irq.h
+++ b/arch/z16/include/irq.h
@@ -72,7 +72,7 @@ chipreg_t up_getsp(void);
 
 #ifndef __ASSEMBLY__
 /* This holds a references to the current interrupt level
- * register storage structure.  If is non-NULL only during
+ * register storage structure.  It is non-NULL only during
  * interrupt processing.
  */
 
diff --git a/arch/z80/src/ez80/switch.h b/arch/z80/src/ez80/switch.h
index b404e02318..ee51ccc0a2 100644
--- a/arch/z80/src/ez80/switch.h
+++ b/arch/z80/src/ez80/switch.h
@@ -115,7 +115,7 @@
 
 #ifndef __ASSEMBLY__
 /* This holds a references to the current interrupt level register
- * storage structure.  If is non-NULL only during interrupt processing.
+ * storage structure.  It is non-NULL only during interrupt processing.
  */
 
 extern volatile chipreg_t *g_current_regs;
diff --git a/arch/z80/src/z180/switch.h b/arch/z80/src/z180/switch.h
index 090d7e001c..fd9a5f0667 100644
--- a/arch/z80/src/z180/switch.h
+++ b/arch/z80/src/z180/switch.h
@@ -170,7 +170,7 @@
 
 #ifndef __ASSEMBLY__
 /* This holds a references to the current interrupt level register
- * storage structure.  If is non-NULL only during interrupt processing.
+ * storage structure.  It is non-NULL only during interrupt processing.
  */
 
 extern volatile chipreg_t *g_current_regs;
diff --git a/arch/z80/src/z80/switch.h b/arch/z80/src/z80/switch.h
index a0db842040..6b712c1c0f 100644
--- a/arch/z80/src/z80/switch.h
+++ b/arch/z80/src/z80/switch.h
@@ -114,7 +114,7 @@
 
 #ifndef __ASSEMBLY__
 /* This holds a references to the current interrupt level register
- * storage structure.  If is non-NULL only during interrupt processing.
+ * storage structure.  It is non-NULL only during interrupt processing.
  */
 
 extern volatile chipreg_t *g_current_regs;