X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=arch%2Farm%2Fkernel%2Fentry-armv.S;h=437f0c426517cf39c1035c3e7a0b6cfecb9395cb;hb=357c9c1f07d4546bc3fbc0fd1044d96b114d14ed;hp=7fd3ad048da9b7318ed516edc81ae67cb95e0c52;hpb=69964ea4c7b68c9399f7977aa5b9aa6539a6a98a;p=deliverable%2Flinux.git

diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index 7fd3ad048da9..437f0c426517 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -556,10 +556,6 @@ call_fpe:
 #endif
 	tst	r0, #0x08000000			@ only CDP/CPRT/LDC/STC have bit 27
 	tstne	r0, #0x04000000			@ bit 26 set on both ARM and Thumb-2
-#if defined(CONFIG_CPU_ARM610) || defined(CONFIG_CPU_ARM710)
-	and	r8, r0, #0x0f000000		@ mask out op-code bits
-	teqne	r8, #0x0f000000			@ SWI (ARM6/7 bug)?
-#endif
 	moveq	pc, lr
 	get_thread_info r10			@ get current thread
 	and	r8, r0, #0x00000f00		@ mask out CP number