[PATCH] ARM: Re-enable TRACE_IRQFLAGS_SUPPORT on ARMv7-M

Maxime Coquelin mcoquelin.stm32 at gmail.com
Mon Jun 8 15:24:48 PDT 2015


Commit cb1293e2f594 ("ARM: 8375/1: disable some options on ARMv7-M") causes
build failure on ARMv7-M machines:

  CC      arch/arm/kernel/asm-offsets.s
In file included from include/linux/sem.h:5:0,
                 from include/linux/sched.h:35,
                 from arch/arm/kernel/asm-offsets.c:14:
include/linux/rcupdate.h: In function 'rcu_read_lock_sched_held':
include/linux/rcupdate.h:539:2: error: implicit declaration of function 'arch_irqs_disabled' [-Werror=implicit-function-declaration]
  return preempt_count() != 0 || irqs_disabled();
  ^
Commit cb1293e2f594 was initially introduced to fix build errors with randconfig,
as ARMv7-m selects TRACE_IRQFLAGS_SUPPORT but breaks build when TRACE_IRQFLAGS
is selected.

As there is no proper support yet for TRACE_IRQFLAGS, this patch partially
reverts commit cb1293e2f594, with the downside of build errors with randconfig
when TRACE_IRQFLAGS gets selected.

Cc: Arnd Bergmann <arnd at arndb.de>
Cc: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>
Cc: Russell King <rmk+kernel at arm.linux.org.uk>
Signed-off-by: Maxime Coquelin <mcoquelin.stm32 at gmail.com>
---
 arch/arm/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index b47457d..e4e1694 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -171,7 +171,7 @@ config LOCKDEP_SUPPORT
 
 config TRACE_IRQFLAGS_SUPPORT
 	bool
-	default !CPU_V7M
+	default y
 
 config RWSEM_XCHGADD_ALGORITHM
 	bool
-- 
1.9.1




More information about the linux-arm-kernel mailing list