Commit 9d6c4523 authored Jun 29, 2017 by Naveen N. Rao Committed by Michael Ellerman Jul 03, 2017

powerpc/64s: Convert .L__replay_interrupt_return to a local label



Commit b48bbb82 ("powerpc/64s: Don't unbalance the return branch
predictor in __replay_interrupt()") introduced __replay_interrupt_return
symbol with '.L' prefix in hopes of keeping it private. However, due to
the use of LOAD_REG_ADDR(), the assembler kept this symbol visible. Fix
the same by instead using the local label '1'.

Fixes: Commit b48bbb82 ("powerpc/64s: Don't unbalance the return branch
predictor in __replay_interrupt()")
Suggested-by: Nicholas Piggin <npiggin@gmail.com>
Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

parent 83e840c7

arch/powerpc/kernel/exceptions-64s.S

+2 −2

Original line number	Diff line number	Diff line
		@@ -1634,7 +1634,7 @@ _GLOBAL(__replay_interrupt)
		* we don't give a damn about, so we don't bother storing them.
		*/
		mfmsr r12
		LOAD_REG_ADDR(r11, .L__replay_interrupt_return)
		LOAD_REG_ADDR(r11, 1f)
		mfcr r9
		ori r12,r12,MSR_EE
		cmpwi r3,0x900
		@@ -1652,6 +1652,6 @@ FTR_SECTION_ELSE
		cmpwi r3,0xa00
		beq doorbell_super_common_msgclr
		ALT_FTR_SECTION_END_IFSET(CPU_FTR_HVMODE)
		.L__replay_interrupt_return:
		1:
		blr