From 2e70eef76720023af10a8cca72b4e44cfe28924f Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sat, 26 Jan 2019 07:04:15 -0600 Subject: [PATCH] arch/arm/include/armv-7m/irq.h and armv6-m/irq.h: Remove redundant conditioning on CONFIG_BUILD_PROTECTED --- arch/arm/include/armv6-m/irq.h | 2 -- arch/arm/include/armv7-m/irq.h | 2 -- 2 files changed, 4 deletions(-) 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. */