Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb1293e2 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Russell King
Browse files

ARM: 8375/1: disable some options on ARMv7-M 



Kprobes, irqflags tracing and kexec don't currently build on
kernels targetting ARMv7-M, so for now, we should just disallow
those combinations.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c32b7655

arch/arm/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ config ARM 
	select HAVE_KERNEL_LZMA

	select HAVE_KERNEL_LZO

	select HAVE_KERNEL_XZ

	select HAVE_KPROBES if !XIP_KERNEL && !CPU_ENDIAN_BE32

	select HAVE_KPROBES if !XIP_KERNEL && !CPU_ENDIAN_BE32 && !CPU_V7M

	select HAVE_KRETPROBES if (HAVE_KPROBES)

	select HAVE_MEMBLOCK

	select HAVE_MOD_ARCH_SPECIFIC if ARM_UNWIND
@@ -171,7 +171,7 @@ config LOCKDEP_SUPPORT 


config TRACE_IRQFLAGS_SUPPORT

	bool

	default y

	default !CPU_V7M



config RWSEM_XCHGADD_ALGORITHM

	bool
@@ -1952,6 +1952,7 @@ config XIP_PHYS_ADDR 
config KEXEC

	bool "Kexec system call (EXPERIMENTAL)"

	depends on (!SMP || PM_SLEEP_SMP)

	depends on !CPU_V7M

	help

	  kexec is a system call that implements the ability to shutdown your

	  current kernel, and to start another kernel.  It is like a reboot