diff options
| author | Olof Johansson <olof@lixom.net> | 2012-01-17 01:46:06 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-01-17 01:46:06 -0500 |
| commit | 8b0f6d12de91345190f234edba781b2fd03257b6 (patch) | |
| tree | 4b6015433a0ffe5fc7ff9115014e3da580581f4b /arch/arm/mach-ux500 | |
| parent | 916e5ebb9f5a154bb845d555a1a84ef48411b73a (diff) | |
| parent | efb963dcd9854c70667cdba9b5854b7290f1cefd (diff) | |
Merge branch 'fixes-for-arm-soc' of git://sources.calxeda.com/kernel/linux into fixes
* 'fixes-for-arm-soc' of git://sources.calxeda.com/kernel/linux:
ARM: make BSYM macro assembly only
ARM: highbank: remove incorrect BSYM usage
ARM: imx: remove incorrect BSYM usage
ARM: exynos: remove incorrect BSYM usage
ARM: ux500: add missing ENDPROC to headsmp.S
ARM: msm: Add missing ENDPROC to headsmp.S
ARM: versatile: Add missing ENDPROC to headsmp.S
Diffstat (limited to 'arch/arm/mach-ux500')
| -rw-r--r-- | arch/arm/mach-ux500/headsmp.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/headsmp.S b/arch/arm/mach-ux500/headsmp.S index 64fa451edcfd..08da5589bcd8 100644 --- a/arch/arm/mach-ux500/headsmp.S +++ b/arch/arm/mach-ux500/headsmp.S | |||
| @@ -32,6 +32,8 @@ pen: ldr r7, [r6] | |||
| 32 | * should now contain the SVC stack for this core | 32 | * should now contain the SVC stack for this core |
| 33 | */ | 33 | */ |
| 34 | b secondary_startup | 34 | b secondary_startup |
| 35 | ENDPROC(u8500_secondary_startup) | ||
| 35 | 36 | ||
| 37 | .align 2 | ||
| 36 | 1: .long . | 38 | 1: .long . |
| 37 | .long pen_release | 39 | .long pen_release |