Commit 7ce0f693 authored Mar 27, 2025 by Ingo Molnar

bugs/s390: Pass in 'cond_str' to __EMIT_BUG()



Pass in the condition string from __WARN_FLAGS(), but do not
concatenate it with __FILE__, because it results in s390
assembler build errors that are beyond my s390-asm-fu.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: Sven Schnelle <svens@linux.ibm.com>
Cc: linux-s390@vger.kernel.org
Cc: <linux-arch@vger.kernel.org>
Link: https://lore.kernel.org/r/20250515124644.2958810-11-mingo@kernel.org

parent d6b894cb

arch/s390/include/asm/bug.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@

		#ifdef CONFIG_DEBUG_BUGVERBOSE

		#define __EMIT_BUG(x) do { \
		#define __EMIT_BUG(cond_str, x) do { \
		asm_inline volatile( \
		"0: mc 0,0\n" \
		".section .rodata.str,\"aMS\",@progbits,1\n" \
		@@ -27,7 +27,7 @@

		#else /* CONFIG_DEBUG_BUGVERBOSE */

		#define __EMIT_BUG(x) do { \
		#define __EMIT_BUG(cond_str, x) do { \
		asm_inline volatile( \
		"0: mc 0,0\n" \
		".section __bug_table,\"aw\"\n" \
		@@ -42,12 +42,12 @@
		#endif /* CONFIG_DEBUG_BUGVERBOSE */

		#define BUG() do { \
		__EMIT_BUG(0); \
		__EMIT_BUG("", 0); \
		unreachable(); \
		} while (0)

		#define __WARN_FLAGS(cond_str, flags) do { \
		__EMIT_BUG(BUGFLAG_WARNING\|(flags)); \
		__EMIT_BUG(cond_str, BUGFLAG_WARNING\|(flags)); \
		} while (0)

		#define WARN_ON(x) ({ \