Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a58f053b authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Paul Mackerras
Browse files

powerpc: Fix asm EMIT_BUG_ENTRY with !CONFIG_BUG 



Instead of not defining it at all, this defines the macro as
being empty, thus avoiding ifdef's in call sites when CONFIG_BUG
is not set.

Also removes an extra whitespace in the existing definition.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 3045b3cb

arch/powerpc/include/asm/bug.h

+10 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#ifdef __KERNEL__



#include <asm/asm-compat.h>



/*

 * Define an illegal instr to trap on the bug.

 * We don't use 0 because that marks the end of a function
@@ -14,6 +15,7 @@ 
#ifdef CONFIG_BUG



#ifdef __ASSEMBLY__

#include <asm/asm-offsets.h>

#ifdef CONFIG_DEBUG_BUGVERBOSE

.macro EMIT_BUG_ENTRY addr,file,line,flags

	 .section __bug_table,"a"
@@ -113,6 +115,13 @@ 
#define HAVE_ARCH_BUG_ON

#define HAVE_ARCH_WARN_ON

#endif /* __ASSEMBLY __ */

#else

#ifdef __ASSEMBLY__

.macro EMIT_BUG_ENTRY addr,file,line,flags

.endm

#else /* !__ASSEMBLY__ */

#define _EMIT_BUG_ENTRY

#endif

#endif /* CONFIG_BUG */



#include <asm-generic/bug.h>