[ARM SMP] Only enable V6K instructions on V6 MP core CPUs

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/lib/bitops.h b/arch/arm/lib/bitops.h
index 2036ff15bda9b70e0c5f8b6f79538008ebe393e4..64a988c1ad447739ccf7a67d4b4c0ebdb7e3f6d2 100644 (file)
--- 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