diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-05-06 21:29:25 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-05-06 21:29:25 -0400 |
| commit | 1ed31d6db90d51010545921e59d369d2f92b7ac2 (patch) | |
| tree | 358a0b346bc8135cd5e53700eb44308b1a7c8c5b /arch/arm/mach-omap2/omap-headsmp.S | |
| parent | ceba1abcb00b0ef0b1efcd715285f6e05523edef (diff) | |
| parent | 722154e4cacf015161efe60009ae9be23d492296 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'arch/arm/mach-omap2/omap-headsmp.S')
| -rw-r--r-- | arch/arm/mach-omap2/omap-headsmp.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/omap-headsmp.S b/arch/arm/mach-omap2/omap-headsmp.S index aa3f65c2ac97..ef0e7a00dd6c 100644 --- a/arch/arm/mach-omap2/omap-headsmp.S +++ b/arch/arm/mach-omap2/omap-headsmp.S | |||
| @@ -33,7 +33,7 @@ | |||
| 33 | ENTRY(omap_secondary_startup) | 33 | ENTRY(omap_secondary_startup) |
| 34 | hold: ldr r12,=0x103 | 34 | hold: ldr r12,=0x103 |
| 35 | dsb | 35 | dsb |
| 36 | smc @ read from AuxCoreBoot0 | 36 | smc #0 @ read from AuxCoreBoot0 |
| 37 | mov r0, r0, lsr #9 | 37 | mov r0, r0, lsr #9 |
| 38 | mrc p15, 0, r4, c0, c0, 5 | 38 | mrc p15, 0, r4, c0, c0, 5 |
| 39 | and r4, r4, #0x0f | 39 | and r4, r4, #0x0f |
| @@ -52,7 +52,7 @@ ENTRY(omap_modify_auxcoreboot0) | |||
| 52 | stmfd sp!, {r1-r12, lr} | 52 | stmfd sp!, {r1-r12, lr} |
| 53 | ldr r12, =0x104 | 53 | ldr r12, =0x104 |
| 54 | dsb | 54 | dsb |
| 55 | smc | 55 | smc #0 |
| 56 | ldmfd sp!, {r1-r12, pc} | 56 | ldmfd sp!, {r1-r12, pc} |
| 57 | END(omap_modify_auxcoreboot0) | 57 | END(omap_modify_auxcoreboot0) |
| 58 | 58 | ||
| @@ -60,6 +60,6 @@ ENTRY(omap_auxcoreboot_addr) | |||
| 60 | stmfd sp!, {r2-r12, lr} | 60 | stmfd sp!, {r2-r12, lr} |
| 61 | ldr r12, =0x105 | 61 | ldr r12, =0x105 |
| 62 | dsb | 62 | dsb |
| 63 | smc | 63 | smc #0 |
| 64 | ldmfd sp!, {r2-r12, pc} | 64 | ldmfd sp!, {r2-r12, pc} |
| 65 | END(omap_auxcoreboot_addr) | 65 | END(omap_auxcoreboot_addr) |