On Thu, 22 Jun 2017 00:08:38 +0530
"Naveen N. Rao" <naveen.n....@linux.vnet.ibm.com> wrote:
> Commit b48bbb82e2b835 ("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 b48bbb82e2b835 ("powerpc/64s: Don't unbalance the return branch
> predictor in __replay_interrupt()")
> Suggested-by: Nicholas Piggin <npig...@gmail.com>
Thanks, good catch.
Reviewed-by: Nicholas Piggin <npig...@gmail.com>
> Signed-off-by: Naveen N. Rao <naveen.n....@linux.vnet.ibm.com>
> ---
> arch/powerpc/kernel/exceptions-64s.S | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/powerpc/kernel/exceptions-64s.S
> b/arch/powerpc/kernel/exceptions-64s.S
> index 07b79c2c70f8..2df6d7b3070f 100644
> --- a/arch/powerpc/kernel/exceptions-64s.S
> +++ b/arch/powerpc/kernel/exceptions-64s.S
> @@ -1629,7 +1629,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
> @@ -1647,6 +1647,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
>
