Re: [PATCH] [v2] arm64: define BUG() instruction without CONFIG_BUG

From: Arnd Bergmann
Date: Wed Mar 22 2017 - 12:29:29 EST


On Wed, Mar 22, 2017 at 4:32 PM, Catalin Marinas
<catalin.marinas@xxxxxxx> wrote:
> On Wed, Mar 22, 2017 at 03:51:54PM +0100, Arnd Bergmann wrote:
>> On Wed, Mar 22, 2017 at 3:37 PM, Catalin Marinas
>> <catalin.marinas@xxxxxxx> wrote:

>> Taht was certainly not intended, and I don't see yet what exactly is going on.
>> What is your setting for CONFIG_BUG and CONFIG_BUGVERBOSE?
>
> CONFIG_BUG=y
> CONFIG_DEBUG_BUGVERBOSE=y

Ok, I found the typo, can you just fold this in, or should I send an
updated patch?

Arnd

diff --git a/arch/arm64/include/asm/bug.h b/arch/arm64/include/asm/bug.h
index bfc6021760e5..ff030254f791 100644
--- a/arch/arm64/include/asm/bug.h
+++ b/arch/arm64/include/asm/bug.h
@@ -49,10 +49,10 @@ _BUGVERBOSE_LOCATION(__FILE__, __LINE__) \

#define __BUG_FLAGS(flags) \
asm volatile ( \
- __BUG_ENTRY(0) \
+ __BUG_ENTRY(flags) \
"brk %[imm]" :: [imm] "i" (BUG_BRK_IMM) \
);

#define BUG() do { \
__BUG_FLAGS(0); \
unreachable(); \