[PATCH 5.14 034/100] s390/entry: make oklabel within CHKSTG macro local

From: Greg Kroah-Hartman
Date: Fri Sep 24 2021 - 09:03:28 EST

From: Heiko Carstens <hca@xxxxxxxxxxxxx>

[ Upstream commit 15256194eff64f9a774b33b7817ea663e352394a ]

Make the oklabel within the CHKSTG macro local. This makes sure that
tools like objdump and the crash debugging tool still disassemble full
functions where the macro has been used instead of stopping half way
where such a global label is used and one has to guess how to
disassemble the rest of such a function:


0000000000cb0270 <mcck_int_handler>:
cb0270: b2 05 03 20 stck 800
cb0354: a7 74 00 97 jne cb0482 <oklabel270+0xe2>

0000000000cb0358 <oklabel243>:
cb0358: c0 e0 00 22 4e 8f larl %r14,10fa076 <opcode+0x2558>

Fixes: d35925b34996 ("s390/mcck: move storage error checks to assembler")
Reviewed-by: Alexander Gordeev <agordeev@xxxxxxxxxxxxx>
Signed-off-by: Heiko Carstens <hca@xxxxxxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
arch/s390/kernel/entry.S | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S
index b9716a7e326d..4c9b967290ae 100644
--- a/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
@@ -140,10 +140,10 @@ _LPP_OFFSET = __LC_LPP
jnz \errlabel
- jz oklabel\@
+ jz .Loklabel\@
jnz \errlabel