diff options
| author | Nathan Lynch <nathan_lynch@mentor.com> | 2015-04-17 16:51:38 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-04-17 19:23:25 -0400 |
| commit | 5d38000b3c97a1079734c0b4c5f87d5b935318cd (patch) | |
| tree | dd529dfba3136d550472efc82c4a439da98e5b93 /arch/arm | |
| parent | e5b61deb3af465f11db7e5e11944ba00a33ece1f (diff) | |
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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
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 | |||
| 827 | 827 | ||
| 828 | config VDSO | 828 | config VDSO |
| 829 | bool "Enable VDSO for acceleration of some system calls" | 829 | bool "Enable VDSO for acceleration of some system calls" |
| 830 | depends on AEABI && MMU | 830 | depends on AEABI && MMU && CPU_V7 |
| 831 | default y if ARM_ARCH_TIMER | 831 | default y if ARM_ARCH_TIMER |
| 832 | select GENERIC_TIME_VSYSCALL | 832 | select GENERIC_TIME_VSYSCALL |
| 833 | help | 833 | help |