Commit c07b5fd0 authored May 18, 2015 by Yingjoe Chen Committed by Russell King Jun 02, 2015

ARM: 8359/1: correct secondary_startup_arm mode



secondary_startup_arm is used as ARM mode secondary start up function
when ther kernel is compiled in THUMB mode, however the label itself
is still in .thumb mode. readelf shows:

160979: c020a581   120 FUNC    GLOBAL DEFAULT    2 secondary_startup_arm

Make sure the label is in ARM mode as well.

Signed-off-by: Yingjoe Chen <yingjoe.chen@mediatek.com>
Tested-by: Matthias Brugger <matthias.bgg@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent 5b290ec2

arch/arm/kernel/head.S

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -346,8 +346,8 @@ __turn_mmu_on_loc:

	#if defined(CONFIG_SMP)		#if defined(CONFIG_SMP)
	.text		.text
	ENTRY(secondary_startup_arm)
	.arm		.arm
			ENTRY(secondary_startup_arm)
	THUMB( adr r9, BSYM(1f) ) @ Kernel is entered in ARM.		THUMB( adr r9, BSYM(1f) ) @ Kernel is entered in ARM.
	THUMB( bx r9 ) @ If this is a Thumb-2 kernel,		THUMB( bx r9 ) @ If this is a Thumb-2 kernel,
	THUMB( .thumb ) @ switch to Thumb now.		THUMB( .thumb ) @ switch to Thumb now.