Commit 9ce93bdd authored Jun 12, 2015 by Russell King

ARM: fix new BSYM() usage introduced via for-arm-soc branch



Commit 32e55a77 ("ARM: 8389/1: Add cpu_resume_arm() for firmwares
that resume in ARM state") needed to introduce a new usage of BSYM()
to fix a problem with a previous patch.  This in turn causes a conflict
with the "bsym" branch which removes this symbol, replacing it with a
'badr' assembly macro.  Fix this up.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent a9dd3865

arch/arm/kernel/sleep.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -122,7 +122,7 @@ ENDPROC(cpu_resume_after_mmu)
		#ifdef CONFIG_MMU
		.arm
		ENTRY(cpu_resume_arm)
		THUMB( adr r9, BSYM(1f) ) @ Kernel is entered in ARM.
		THUMB( badr r9, 1f ) @ Kernel is entered in ARM.
		THUMB( bx r9 ) @ If this is a Thumb-2 kernel,
		THUMB( .thumb ) @ switch to Thumb now.
		THUMB(1: )

Admin message