From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Wed, 10 Aug 2005 13:41:45 +0000 (+0100)
Subject: [ARM SMP] Only enable V6K instructions on V6 MP core CPUs
X-Git-Tag: v2.6.13-rc7~107^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3c4ee4e2520775896efc6ab850c4c27971fbcf2a;p=linux-2.6-omap-h63xx.git

[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 2036ff15bda..64a988c1ad4 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