diff --git a/arch/arm/include/armv6-m/irq.h b/arch/arm/include/armv6-m/irq.h
index 1d3da28e95a..554f3b6da23 100644
--- a/arch/arm/include/armv6-m/irq.h
+++ b/arch/arm/include/armv6-m/irq.h
@@ -180,9 +180,7 @@ struct xcptcontext
   uint32_t saved_xpsr;
 #ifdef CONFIG_BUILD_PROTECTED
   uint32_t saved_lr;
-#endif
 
-# ifdef CONFIG_BUILD_PROTECTED
   /* This is the saved address to use when returning from a user-space
    * signal handler.
    */
diff --git a/arch/arm/include/armv7-m/irq.h b/arch/arm/include/armv7-m/irq.h
index 061b6194dcb..04b9aa57666 100644
--- a/arch/arm/include/armv7-m/irq.h
+++ b/arch/arm/include/armv7-m/irq.h
@@ -139,9 +139,7 @@ struct xcptcontext
   uint32_t saved_xpsr;
 #ifdef CONFIG_BUILD_PROTECTED
   uint32_t saved_lr;
-#endif
 
-# ifdef CONFIG_BUILD_PROTECTED
   /* This is the saved address to use when returning from a user-space
    * signal handler.
    */