mirror of
https://github.com/torvalds/linux.git
synced 2026-05-31 02:24:24 +02:00
bugs/riscv: Pass in 'cond_str' to __BUG_FLAGS()
Pass in the condition string from __WARN_FLAGS() to __BUG_FLAGS(), but don't use it yet. Signed-off-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Signed-off-by: Ingo Molnar <mingo@kernel.org> # Rebased ancestor commits Acked-by: Peter Zijlstra <peterz@infradead.org> Cc: Albert Ou <aou@eecs.berkeley.edu> Cc: Alexandre Ghiti <alex@ghiti.fr> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Palmer Dabbelt <palmer@dabbelt.com> Cc: Paul Walmsley <paul.walmsley@sifive.com> Cc: linux-arch@vger.kernel.org Cc: linux-riscv@lists.infradead.org Link: https://lore.kernel.org/r/20250515124644.2958810-12-mingo@kernel.org
This commit is contained in:
parent
6584ff203a
commit
7e8c292692
|
|
@ -50,7 +50,7 @@ typedef u32 bug_insn_t;
|
|||
#endif
|
||||
|
||||
#ifdef CONFIG_GENERIC_BUG
|
||||
#define __BUG_FLAGS(flags) \
|
||||
#define __BUG_FLAGS(cond_str, flags) \
|
||||
do { \
|
||||
__asm__ __volatile__ ( \
|
||||
"1:\n\t" \
|
||||
|
|
@ -66,17 +66,17 @@ do { \
|
|||
"i" (sizeof(struct bug_entry))); \
|
||||
} while (0)
|
||||
#else /* CONFIG_GENERIC_BUG */
|
||||
#define __BUG_FLAGS(flags) do { \
|
||||
#define __BUG_FLAGS(cond_str, flags) do { \
|
||||
__asm__ __volatile__ ("ebreak\n"); \
|
||||
} while (0)
|
||||
#endif /* CONFIG_GENERIC_BUG */
|
||||
|
||||
#define BUG() do { \
|
||||
__BUG_FLAGS(0); \
|
||||
__BUG_FLAGS("", 0); \
|
||||
unreachable(); \
|
||||
} while (0)
|
||||
|
||||
#define __WARN_FLAGS(cond_str, flags) __BUG_FLAGS(BUGFLAG_WARNING|(flags))
|
||||
#define __WARN_FLAGS(cond_str, flags) __BUG_FLAGS(cond_str, BUGFLAG_WARNING|(flags))
|
||||
|
||||
#define HAVE_ARCH_BUG
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user