ARM: omap4: Convert END() to ENDPROC() for correct linkage with CONFIG_THUMB2_KERNEL
authorDave Martin <dave.martin@linaro.org>
Fri, 4 Mar 2011 15:33:54 +0000 (15:33 +0000)
committerKevin Hilman <khilman@ti.com>
Thu, 10 Mar 2011 00:38:36 +0000 (16:38 -0800)
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: Dave Martin <dave.martin@linaro.org>
Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
arch/arm/mach-omap2/omap-headsmp.S
arch/arm/mach-omap2/omap44xx-smc.S

index 6ae937a06cc1883f83af604845bf51c859f2adeb..4ee6aeca885a830d31714a2e897ebb4b0ff63660 100644 (file)
@@ -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)
 
index 1980dc31a1a2e85a28e0fc612eee5b41004db5d8..e69d37d952042da5f1d348600f0c3efa41ef9490 100644 (file)
@@ -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)