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

Commit 4d4c068f authored by Nathan Lynch's avatar Nathan Lynch Committed by Mark Salyzyn
Browse files

UPSTREAM: ARM: 8342/1: VDSO: depend on CPU_V7



(cherry pick from commit 5d38000b3c97a1079734c0b4c5f87d5b935318cd)

When targeting ARMv3 (e.g. rpc) and enabling CONFIG_VDSO we get:

arch/arm/vdso/datapage.S:13: Error: selected processor does not
support ARM mode `bx lr'

One fix considered was to use 'ldr pc,lr' for such configurations, but
since the VDSO is unlikely to be useful for pre-v7 hardware, just make
it depend on CONFIG_CPU_V7.

Reported-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarNathan Lynch <nathan_lynch@mentor.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Bug: 20045882
Bug: 19198045
Change-Id: I562d50b26d47de442a05a45b3d544911e92f8629
parent 5fd7b05d
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -827,7 +827,7 @@ config KUSER_HELPERS

config VDSO
	bool "Enable VDSO for acceleration of some system calls"
	depends on AEABI && MMU
	depends on AEABI && MMU && CPU_V7
	default y if ARM_ARCH_TIMER
	select GENERIC_TIME_VSYSCALL
	help