Skip to content

Commit 1a82d43

Browse files
committed
s390/bug: Add missing CONFIG_BUG ifdef again
Fallback to generic BUG implementation in case CONFIG_BUG is disabled. This restores the old behaviour before 'cond_str' support was added. It probably doesn't matter, since nobody should disable CONFIG_BUG, but at least this is consistent to before. Fixes: 6584ff2 ("bugs/s390: Use 'cond_str' in __EMIT_BUG()") Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
1 parent 2f393c2 commit 1a82d43

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

  • arch/s390/include/asm

arch/s390/include/asm/bug.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
#include <linux/stringify.h>
66

7+
#ifdef CONFIG_BUG
8+
79
#ifndef CONFIG_DEBUG_BUGVERBOSE
810
#define _BUGVERBOSE_LOCATION(file, line)
911
#else
@@ -52,6 +54,8 @@ do { \
5254

5355
#define HAVE_ARCH_BUG
5456

57+
#endif /* CONFIG_BUG */
58+
5559
#include <asm-generic/bug.h>
5660

5761
#endif /* _ASM_S390_BUG_H */

0 commit comments

Comments
 (0)