diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 15:20:02 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 15:20:02 +0200 |
| commit | ceb0885d3b01bb2e2f18765770e212914f2864be (patch) | |
| tree | 0952c90cd49704a9172e985ca491d79b60c40bc8 /arch/arm/mm/proc-arm6_7.S | |
| parent | Merge branches 'at91', 'ep93xx', 'kexec', 'iop', 'lmb', 'nomadik', 'nuc', 'pl... (diff) | |
| parent | ARM: 6246/1: mmci: support larger MMCIDATALENGTH register (diff) | |
| download | linux-ceb0885d3b01bb2e2f18765770e212914f2864be.tar.xz linux-ceb0885d3b01bb2e2f18765770e212914f2864be.zip | |
Merge branch 'misc' into devel
Conflicts:
arch/arm/mm/init.c
Diffstat (limited to 'arch/arm/mm/proc-arm6_7.S')
| -rw-r--r-- | arch/arm/mm/proc-arm6_7.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mm/proc-arm6_7.S b/arch/arm/mm/proc-arm6_7.S index 795dc615f43b..64e0b327c7c5 100644 --- a/arch/arm/mm/proc-arm6_7.S +++ b/arch/arm/mm/proc-arm6_7.S @@ -184,8 +184,6 @@ ENTRY(cpu_arm7_proc_init) ENTRY(cpu_arm6_proc_fin) ENTRY(cpu_arm7_proc_fin) - mov r0, #PSR_F_BIT | PSR_I_BIT | SVC_MODE - msr cpsr_c, r0 mov r0, #0x31 @ ....S..DP...M mcr p15, 0, r0, c1, c0, 0 @ disable caches mov pc, lr |