[PATCH 1/4] avoid mis-detecting some V7 cores in the decompressor

[John Stultz]

From: Brian Swetland <swetland at google.com>

This allows kernel decompress to happen nearly instantly instead
of taking over 20 seconds.

CC: Nicolas Pitre <nicolas.pitre at linaro.org>
CC: Russell King <linux at arm.linux.org.uk>
Signed-off-by: Brian Swetland <swetland at google.com>
Signed-off-by: John Stultz <john.stultz at linaro.org>
---
 arch/arm/boot/compressed/head.S |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index 6825c34..18d1847 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -637,6 +637,8 @@ proc_types:
 @		b	__arm6_mmu_cache_off
 @		b	__armv3_mmu_cache_flush
 
+#if !defined(CONFIG_CPU_V7)
+		/* This collides with some V7 IDs, preventing correct detection */
 		.word	0x00000000		@ old ARM ID
 		.word	0x0000f000
 		mov	pc, lr
@@ -645,6 +647,7 @@ proc_types:
  THUMB(		nop				)
 		mov	pc, lr
  THUMB(		nop				)
+#endif
 
 		.word	0x41007000		@ ARM7/710
 		.word	0xfff8fe00
-- 
1.7.3.2.146.gca209