Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f96bdfa0 authored by Dave Martin's avatar Dave Martin Committed by Kevin Hilman
Browse files

ARM: omap4: Convert END() to ENDPROC() for correct linkage with CONFIG_THUMB2_KERNEL 



Code marked with ENTRY() also needs a matching ENDPROC() directive,
in order to ensure that the type and instruction set of the
symbol are correctly annotated.

ENDPROC() tags the affected symbol as a function symbol, which will
ensure that link-time fixups don't accidentally switch to the
wrong instruction set.

Signed-off-by: default avatarDave Martin <dave.martin@linaro.org>
Tested-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent 85243a76

arch/arm/mach-omap2/omap-headsmp.S

+1 −1
Original line number Diff line number Diff line
@@ -45,5 +45,5 @@ hold: ldr r12,=0x103 
	 * should now contain the SVC stack for this core

	 */

	b	secondary_startup

END(omap_secondary_startup)

ENDPROC(omap_secondary_startup)

arch/arm/mach-omap2/omap44xx-smc.S

+4 −4
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ ENTRY(omap_smc1) 
	dsb

	smc	#0

	ldmfd   sp!, {r2-r12, pc}

END(omap_smc1)

ENDPROC(omap_smc1)



ENTRY(omap_modify_auxcoreboot0)

	stmfd   sp!, {r1-r12, lr}
@@ -37,7 +37,7 @@ ENTRY(omap_modify_auxcoreboot0) 
	dsb

	smc	#0

	ldmfd   sp!, {r1-r12, pc}

END(omap_modify_auxcoreboot0)

ENDPROC(omap_modify_auxcoreboot0)



ENTRY(omap_auxcoreboot_addr)

	stmfd   sp!, {r2-r12, lr}
@@ -45,7 +45,7 @@ ENTRY(omap_auxcoreboot_addr) 
	dsb

	smc	#0

	ldmfd   sp!, {r2-r12, pc}

END(omap_auxcoreboot_addr)

ENDPROC(omap_auxcoreboot_addr)



ENTRY(omap_read_auxcoreboot0)

	stmfd   sp!, {r2-r12, lr}
@@ -54,4 +54,4 @@ ENTRY(omap_read_auxcoreboot0) 
	smc	#0

	mov	r0, r0, lsr #9

	ldmfd   sp!, {r2-r12, pc}

END(omap_read_auxcoreboot0)
 
ENDPROC(omap_read_auxcoreboot0)