]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
nommu: Do not override the CP15 control reg value returned from initfunc
authorCatalin Marinas <catalin.marinas@arm.com>
Fri, 24 Jul 2009 11:34:59 +0000 (12:34 +0100)
committerCatalin Marinas <catalin.marinas@arm.com>
Fri, 24 Jul 2009 11:34:59 +0000 (12:34 +0100)
The patch removes the "mrc" instruction in head-nommu.S overriding the
r0 register containing the value to be written in the CP15 system
control register.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
arch/arm/kernel/head-nommu.S

index b16393d2b71eb8a45a2291c3e84c735eca63bb64..e5dfc2895e242b107799029f9fead9ffded41f80 100644 (file)
@@ -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