diff options
author | Catalin Marinas <catalin.marinas@arm.com> | 2009-07-24 07:34:59 -0400 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2009-07-24 07:34:59 -0400 |
commit | 05efde9d04ccc1d66a9d2225527c6ee638baa385 (patch) | |
tree | a979c3a28f3a1713cf685ff669ceda26e50b11e9 /arch/arm/kernel/head-nommu.S | |
parent | 68b7f7153fa58df710924fbb79722717d2d16094 (diff) |
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>
Diffstat (limited to 'arch/arm/kernel/head-nommu.S')
-rw-r--r-- | arch/arm/kernel/head-nommu.S | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/kernel/head-nommu.S b/arch/arm/kernel/head-nommu.S index b16393d2b71e..e5dfc2895e24 100644 --- a/arch/arm/kernel/head-nommu.S +++ b/arch/arm/kernel/head-nommu.S | |||
@@ -61,7 +61,10 @@ ENDPROC(stext) | |||
61 | */ | 61 | */ |
62 | __after_proc_init: | 62 | __after_proc_init: |
63 | #ifdef CONFIG_CPU_CP15 | 63 | #ifdef CONFIG_CPU_CP15 |
64 | mrc p15, 0, r0, c1, c0, 0 @ read control reg | 64 | /* |
65 | * CP15 system control register value returned in r0 from | ||
66 | * the CPU init function. | ||
67 | */ | ||
65 | #ifdef CONFIG_ALIGNMENT_TRAP | 68 | #ifdef CONFIG_ALIGNMENT_TRAP |
66 | orr r0, r0, #CR_A | 69 | orr r0, r0, #CR_A |
67 | #else | 70 | #else |