diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:24:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:24:33 -0500 |
| commit | 2e0e943436912ffe0848ece58167edfe754edb96 (patch) | |
| tree | b91919095c74742fa06e2105db6d859bee39b2b4 /arch/arm/mm/proc-arm9tdmi.S | |
| parent | a32737e1ca650504f172292dd344eb64c02311f3 (diff) | |
| parent | ef3a0bf5bfadbace156fa2a3b9c753df2de41df2 (diff) | |
Merge branch 'devel-stable' into for-linus
Conflicts:
arch/arm/kernel/setup.c
arch/arm/mach-shmobile/board-kota2.c
Diffstat (limited to 'arch/arm/mm/proc-arm9tdmi.S')
| -rw-r--r-- | arch/arm/mm/proc-arm9tdmi.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mm/proc-arm9tdmi.S b/arch/arm/mm/proc-arm9tdmi.S index 2120f9e2af7f..8881391dfb9e 100644 --- a/arch/arm/mm/proc-arm9tdmi.S +++ b/arch/arm/mm/proc-arm9tdmi.S | |||
| @@ -45,8 +45,11 @@ ENTRY(cpu_arm9tdmi_proc_fin) | |||
| 45 | * Params : loc(r0) address to jump to | 45 | * Params : loc(r0) address to jump to |
| 46 | * Purpose : Sets up everything for a reset and jump to the location for soft reset. | 46 | * Purpose : Sets up everything for a reset and jump to the location for soft reset. |
| 47 | */ | 47 | */ |
| 48 | .pushsection .idmap.text, "ax" | ||
| 48 | ENTRY(cpu_arm9tdmi_reset) | 49 | ENTRY(cpu_arm9tdmi_reset) |
| 49 | mov pc, r0 | 50 | mov pc, r0 |
| 51 | ENDPROC(cpu_arm9tdmi_reset) | ||
| 52 | .popsection | ||
| 50 | 53 | ||
| 51 | __CPUINIT | 54 | __CPUINIT |
| 52 | 55 | ||