From: Nathan Lynch <nathan_lynch@mentor.com>
Date: Fri, 17 Apr 2015 20:51:38 +0000 (+0100)
Subject: ARM: 8342/1: VDSO: depend on CPU_V7
X-Git-Tag: firefly_0821_release~176^2~1870^2^3~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5d38000b3c97a1079734c0b4c5f87d5b935318cd;p=firefly-linux-kernel-4.4.55.git

ARM: 8342/1: VDSO: depend on CPU_V7

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: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 8a5f1e644104..16ae9051b262 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -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