From 6bb6a42c6303a4798f28fcb1e8fedcc4954b29a0 Mon Sep 17 00:00:00 2001
From: Catalin Marinas <catalin.marinas@arm.com>
Date: Fri, 24 Jul 2009 12:34:59 +0100
Subject: [PATCH] --- yaml --- r: 160819 b: refs/heads/master c:
 05efde9d04ccc1d66a9d2225527c6ee638baa385 h: refs/heads/master i:   160817:
 6e333581133a1837e9460765788e007e35a6e939   160815:
 d8b554224c10b9bad2aca4c12a6e0b53851d223d v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/kernel/head-nommu.S | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 07a402afcc77..6546310fb779 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68b7f7153fa58df710924fbb79722717d2d16094
+refs/heads/master: 05efde9d04ccc1d66a9d2225527c6ee638baa385
diff --git a/trunk/arch/arm/kernel/head-nommu.S b/trunk/arch/arm/kernel/head-nommu.S
index b16393d2b71e..e5dfc2895e24 100644
--- a/trunk/arch/arm/kernel/head-nommu.S
+++ b/trunk/arch/arm/kernel/head-nommu.S
@@ -61,7 +61,10 @@ ENDPROC(stext)
  */
 __after_proc_init:
 #ifdef CONFIG_CPU_CP15
-	mrc	p15, 0, r0, c1, c0, 0		@ read control reg
+	/*
+	 * CP15 system control register value returned in r0 from
+	 * the CPU init function.
+	 */
 #ifdef CONFIG_ALIGNMENT_TRAP
 	orr	r0, r0, #CR_A
 #else