aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/lib/bitops.h
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-08-10 14:41:45 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-08-10 14:41:45 +0100
commit3c4ee4e2520775896efc6ab850c4c27971fbcf2a (patch)
tree0b1512bf41bde9d89c4076b305df7ceab9db2465 /arch/arm/lib/bitops.h
parent86b3786078d63242d3194ffc58ae8dae1d1bbef3 (diff)
downloadlinux-linaro-stable-3c4ee4e2520775896efc6ab850c4c27971fbcf2a.tar.gz
[ARM SMP] Only enable V6K instructions on V6 MP core CPUs
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/lib/bitops.h')
-rw-r--r--arch/arm/lib/bitops.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/lib/bitops.h b/arch/arm/lib/bitops.h
index 2036ff15bda9..64a988c1ad44 100644
--- a/arch/arm/lib/bitops.h
+++ b/arch/arm/lib/bitops.h
@@ -1,4 +1,6 @@
-#if __LINUX_ARM_ARCH__ >= 6
+#include <linux/config.h>
+
+#if __LINUX_ARM_ARCH__ >= 6 && defined(CONFIG_CPU_MPCORE)
.macro bitop, instr
mov r2, #1
and r3, r0, #7 @ Get bit offset