diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 13:13:54 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 13:13:54 -0400 |
| commit | 11e4afb49b7fa1fc8e1ffd850c1806dd86a08204 (patch) | |
| tree | 9e57efcb106ae912f7bec718feb3f8ec607559bb /arch/arm/mm/proc-arm7tdmi.S | |
| parent | 162500b3a3ff39d941d29db49b41a16667ae44f0 (diff) | |
| parent | 9b2a606d3898fcb2eedb6faded3bb37549590ac4 (diff) | |
Merge branches 'gemini' and 'misc' into devel
Diffstat (limited to 'arch/arm/mm/proc-arm7tdmi.S')
| -rw-r--r-- | arch/arm/mm/proc-arm7tdmi.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mm/proc-arm7tdmi.S b/arch/arm/mm/proc-arm7tdmi.S index 1201b9863829..6a850dbba22e 100644 --- a/arch/arm/mm/proc-arm7tdmi.S +++ b/arch/arm/mm/proc-arm7tdmi.S | |||
| @@ -36,8 +36,6 @@ ENTRY(cpu_arm7tdmi_switch_mm) | |||
| 36 | * cpu_arm7tdmi_proc_fin() | 36 | * cpu_arm7tdmi_proc_fin() |
| 37 | */ | 37 | */ |
| 38 | ENTRY(cpu_arm7tdmi_proc_fin) | 38 | ENTRY(cpu_arm7tdmi_proc_fin) |
| 39 | mov r0, #PSR_F_BIT | PSR_I_BIT | SVC_MODE | ||
| 40 | msr cpsr_c, r0 | ||
| 41 | mov pc, lr | 39 | mov pc, lr |
| 42 | 40 | ||
| 43 | /* | 41 | /* |