This is a note to let you know that I've just added the patch titled
parisc: Fix asm operand number out of range build error in bug table
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
parisc-fix-asm-operand-number-out-of-range-build-err.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit a689ed7a789e1a4f0aa9d6db8b1784e9824071ae
Author: Helge Deller <deller@xxxxxx>
Date: Mon Nov 27 10:39:26 2023 +0100
parisc: Fix asm operand number out of range build error in bug table
[ Upstream commit 487635756198cad563feb47539c6a37ea57f1dae ]
Build is broken if CONFIG_DEBUG_BUGVERBOSE=n.
Fix it be using the correct asm operand number.
Signed-off-by: Helge Deller <deller@xxxxxx>
Reported-by: Linux Kernel Functional Testing <lkft@xxxxxxxxxx>
Fixes: fe76a1349f23 ("parisc: Use natural CPU alignment for bug_table")
Cc: stable@xxxxxxxxxxxxxxx # v6.0+
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/arch/parisc/include/asm/bug.h b/arch/parisc/include/asm/bug.h
index 1641ff9a8b83e..833555f74ffa7 100644
--- a/arch/parisc/include/asm/bug.h
+++ b/arch/parisc/include/asm/bug.h
@@ -71,7 +71,7 @@
asm volatile("\n" \
"1:\t" PARISC_BUG_BREAK_ASM "\n" \
"\t.pushsection __bug_table,\"a\"\n" \
- "\t.align %2\n" \
+ "\t.align 4\n" \
"2:\t" __BUG_REL(1b) "\n" \
"\t.short %0\n" \
"\t.blockz %1-4-2\n" \
