diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/include/asm/bug.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/x86/include/asm/bug.h b/arch/x86/include/asm/bug.h index d0a96ff5c02c0b..4b5ab56903bb78 100644 --- a/arch/x86/include/asm/bug.h +++ b/arch/x86/include/asm/bug.h @@ -86,7 +86,7 @@ extern void __WARN_trap(struct bug_entry *bug, ...); #ifdef CONFIG_DEBUG_BUGVERBOSE_DETAILED #define WARN_CONDITION_STR(cond_str) cond_str #else -#define WARN_CONDITION_STR(cond_str) NULL +#define WARN_CONDITION_STR(cond_str) "" #endif #define _BUG_FLAGS(cond_str, ins, flags, extra) \ @@ -103,8 +103,12 @@ do { \ } while (0) #define ARCH_WARN_ASM(file, line, flags, size) \ + ".pushsection .rodata.str1.1, \"aMS\", @progbits, 1\n" \ + "99:\n" \ + "\t.string \"\"\n" \ + ".popsection\n" \ "1:\t " ASM_UD2 "\n" \ - _BUG_FLAGS_ASM("0", file, line, flags, size, "") + _BUG_FLAGS_ASM("99b", file, line, flags, size, "") #else |