diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-11-19 07:30:42 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-12-02 19:12:17 -0500 |
commit | 437682eeab45ab8c8c1e027afd023e39f32f9032 (patch) | |
tree | 41bc0cc4163046d80c5a39833ad6fe1116505981 | |
parent | 0e2f91e94be2c6986cef9397b10faf4e0eaa5a60 (diff) |
ARM: 8456/1: code patching only works on MMU
There is no __set_fixmap implementation for NOMMU kernels, so
we cannot link the kernel/patch.c file:
arch/arm/kernel/built-in.o: In function `patch_map':
:(.text+0x257e): undefined reference to `__set_fixmap'
arch/arm/kernel/built-in.o: In function `__patch_text_real':
:(.text+0x2618): undefined reference to `__set_fixmap'
:(.text+0x262e): undefined reference to `__set_fixmap'
To work around that, this adds dependencies for all features
that rely on code patching.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a1d3c82ccaeb..9f1eeb2e7d75 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -33,8 +33,8 @@ config ARM | |||
33 | select HARDIRQS_SW_RESEND | 33 | select HARDIRQS_SW_RESEND |
34 | select HAVE_ARCH_AUDITSYSCALL if (AEABI && !OABI_COMPAT) | 34 | select HAVE_ARCH_AUDITSYSCALL if (AEABI && !OABI_COMPAT) |
35 | select HAVE_ARCH_BITREVERSE if (CPU_32v7M || CPU_32v7) && !CPU_32v6 | 35 | select HAVE_ARCH_BITREVERSE if (CPU_32v7M || CPU_32v7) && !CPU_32v6 |
36 | select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 | 36 | select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU |
37 | select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32 | 37 | select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32 && MMU |
38 | select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT) | 38 | select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT) |
39 | select HAVE_ARCH_TRACEHOOK | 39 | select HAVE_ARCH_TRACEHOOK |
40 | select HAVE_BPF_JIT | 40 | select HAVE_BPF_JIT |
@@ -45,7 +45,7 @@ config ARM | |||
45 | select HAVE_DMA_API_DEBUG | 45 | select HAVE_DMA_API_DEBUG |
46 | select HAVE_DMA_ATTRS | 46 | select HAVE_DMA_ATTRS |
47 | select HAVE_DMA_CONTIGUOUS if MMU | 47 | select HAVE_DMA_CONTIGUOUS if MMU |
48 | select HAVE_DYNAMIC_FTRACE if (!XIP_KERNEL) && !CPU_ENDIAN_BE32 | 48 | select HAVE_DYNAMIC_FTRACE if (!XIP_KERNEL) && !CPU_ENDIAN_BE32 && MMU |
49 | select HAVE_EFFICIENT_UNALIGNED_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && MMU | 49 | select HAVE_EFFICIENT_UNALIGNED_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && MMU |
50 | select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL) | 50 | select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL) |
51 | select HAVE_FUNCTION_GRAPH_TRACER if (!THUMB2_KERNEL) | 51 | select HAVE_FUNCTION_GRAPH_TRACER if (!THUMB2_KERNEL) |