diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2009-07-24 12:34:59 +0100 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2009-07-24 12:34:59 +0100 |
| commit | 05efde9d04ccc1d66a9d2225527c6ee638baa385 (patch) | |
| tree | a979c3a28f3a1713cf685ff669ceda26e50b11e9 /arch/arm/kernel/head-nommu.S | |
| parent | 68b7f7153fa58df710924fbb79722717d2d16094 (diff) | |
| download | blackbird-op-linux-05efde9d04ccc1d66a9d2225527c6ee638baa385.tar.gz blackbird-op-linux-05efde9d04ccc1d66a9d2225527c6ee638baa385.zip | |
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) */ __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 |
