From 1581130dfb90ef52931c9dcb18e66eda2bb5d8b9 Mon Sep 17 00:00:00 2001
From: Catalin Marinas <catalin.marinas@arm.com>
Date: Tue, 15 Feb 2011 18:06:57 +0100
Subject: [PATCH] --- yaml --- r: 233484 b: refs/heads/master c:
 315cfe7835c9a3fe27f15519bdeee8bf0a293e33 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/arch/arm/kernel/setup.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 018237c711b6..d5e8542ac9f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32c3fcb08178f6ca14191b22d72760984cfb75cb
+refs/heads/master: 315cfe7835c9a3fe27f15519bdeee8bf0a293e33
diff --git a/trunk/arch/arm/kernel/setup.c b/trunk/arch/arm/kernel/setup.c
index 420b8d6485d6..5ea4fb718b97 100644
--- a/trunk/arch/arm/kernel/setup.c
+++ b/trunk/arch/arm/kernel/setup.c
@@ -226,8 +226,8 @@ int cpu_architecture(void)
 		 * Register 0 and check for VMSAv7 or PMSAv7 */
 		asm("mrc	p15, 0, %0, c0, c1, 4"
 		    : "=r" (mmfr0));
-		if ((mmfr0 & 0x0000000f) == 0x00000003 ||
-		    (mmfr0 & 0x000000f0) == 0x00000030)
+		if ((mmfr0 & 0x0000000f) >= 0x00000003 ||
+		    (mmfr0 & 0x000000f0) >= 0x00000030)
 			cpu_arch = CPU_ARCH_ARMv7;
 		else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
 			 (mmfr0 & 0x000000f0) == 0x00000020)