瀏覽代碼

nommu: Do not override the CP15 control reg value returned from initfunc

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>
Catalin Marinas 16 年之前
父節點
當前提交
05efde9d04
共有 1 個文件被更改,包括 4 次插入1 次删除
  1. 4 1
      arch/arm/kernel/head-nommu.S

+ 4 - 1
arch/arm/kernel/head-nommu.S

@@ -61,7 +61,10 @@ ENDPROC(stext)
  */
  */
 __after_proc_init:
 __after_proc_init:
 #ifdef CONFIG_CPU_CP15
 #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
 #ifdef CONFIG_ALIGNMENT_TRAP
 	orr	r0, r0, #CR_A
 	orr	r0, r0, #CR_A
 #else
 #else