diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2017-08-22 11:51:37 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-08-23 22:27:05 +1000 |
| commit | 3e23a12bcaf18b3587088807722cd25b562d7731 (patch) | |
| tree | 64d206524602ee36aa7257b42fe89d719295ef91 /arch/powerpc | |
| parent | 215ee763f8cb9a2912d411f96f6f67a35d644c6b (diff) | |
| download | blackbird-obmc-linux-3e23a12bcaf18b3587088807722cd25b562d7731.tar.gz blackbird-obmc-linux-3e23a12bcaf18b3587088807722cd25b562d7731.zip | |
powerpc/64s: Fix replay interrupt return label name
In __replay_interrupt() we take the address of a local label so we can
return to it later. However the assembler turns the local label into a
symbol with a name like ".L1^B42" - where "^B" is literally "\002".
This does not make for pleasant stack traces. Fix it by giving the
label a sensible name.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/exceptions-64s.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index e66cbb1c6bc2..3c36ecbc1539 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -1671,7 +1671,7 @@ _GLOBAL(__replay_interrupt) * we don't give a damn about, so we don't bother storing them. */ mfmsr r12 - LOAD_REG_ADDR(r11, 1f) + LOAD_REG_ADDR(r11, replay_interrupt_return) mfcr r9 ori r12,r12,MSR_EE cmpwi r3,0x900 @@ -1689,7 +1689,7 @@ FTR_SECTION_ELSE cmpwi r3,0xa00 beq doorbell_super_common_msgclr ALT_FTR_SECTION_END_IFSET(CPU_FTR_HVMODE) -1: +replay_interrupt_return: blr _ASM_NOKPROBE_SYMBOL(__replay_interrupt) |
