summaryrefslogtreecommitdiff
path: root/arch/arm/mm
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-11-03 21:02:39 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-11-03 21:02:39 +0000
commit5f8b1178e246422ebddc1b16487314c91edf85fe (patch)
tree67b0b09acc80bfc1ca81f92cdad45ca156706bea /arch/arm/mm
parent24bcc2f46cf8982dbc02c8e3037dfc5e12f1e35c (diff)
parent7e5e6e9a509c4ed2973a345ec7ffb96577f42e26 (diff)
downloadlinux-3.10-5f8b1178e246422ebddc1b16487314c91edf85fe.tar.gz
linux-3.10-5f8b1178e246422ebddc1b16487314c91edf85fe.tar.bz2
linux-3.10-5f8b1178e246422ebddc1b16487314c91edf85fe.zip
[ARM] Merge SMP tree
Diffstat (limited to 'arch/arm/mm')
-rw-r--r--arch/arm/mm/Kconfig12
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 5568403e984..e3c14d6b432 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -250,6 +250,18 @@ config CPU_V6
select CPU_COPY_V6
select CPU_TLB_V6
+# ARMv6k
+config CPU_32v6K
+ bool "Support ARM V6K processor extensions" if !SMP
+ depends on CPU_V6
+ default y if SMP
+ help
+ Say Y here if your ARMv6 processor supports the 'K' extension.
+ This enables the kernel to use some instructions not present
+ on previous processors, and as such a kernel build with this
+ enabled will not boot on processors with do not support these
+ instructions.
+
# Figure out what processor architecture version we should be using.
# This defines the compiler instruction set which depends on the machine type.
config CPU_32v3