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

Commit f13d52cb authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Catalin Marinas
Browse files

arm64: define BUG() instruction without CONFIG_BUG 



This mirrors commit e9c38ceb ("ARM: 8455/1: define __BUG as
asm(BUG_INSTR) without CONFIG_BUG") to make the behavior of
arm64 consistent with arm and x86, and avoids lots of warnings in
randconfig builds, such as:

kernel/seccomp.c: In function '__seccomp_filter':
kernel/seccomp.c:666:1: error: no return statement in function returning non-void [-Werror=return-type]

Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent c651aae5

arch/arm64/include/asm/bug.h

+19 −14
Original line number Diff line number Diff line
@@ -20,9 +20,6 @@ 


#include <asm/brk-imm.h>



#ifdef CONFIG_GENERIC_BUG

#define HAVE_ARCH_BUG



#ifdef CONFIG_DEBUG_BUGVERBOSE

#define _BUGVERBOSE_LOCATION(file, line) __BUGVERBOSE_LOCATION(file, line)

#define __BUGVERBOSE_LOCATION(file, line)				\
@@ -36,28 +33,36 @@ 
#define _BUGVERBOSE_LOCATION(file, line)

#endif



#define _BUG_FLAGS(flags) __BUG_FLAGS(flags)

#ifdef CONFIG_GENERIC_BUG



#define __BUG_FLAGS(flags) asm volatile (		\

#define __BUG_ENTRY(flags) 				\

		".pushsection __bug_table,\"a\"\n\t"	\

		".align 2\n\t"				\

	"0:	.long 1f - 0b\n\t"			\

_BUGVERBOSE_LOCATION(__FILE__, __LINE__)		\

		".short " #flags "\n\t"			\

		".popsection\n"				\

							\

	"1:	brk %[imm]"				\

		:: [imm] "i" (BUG_BRK_IMM)		\

)

	"1:	"

#else

#define __BUG_ENTRY(flags) ""

#endif



#define __BUG_FLAGS(flags)				\

	asm volatile (					\

		__BUG_ENTRY(flags)			\

		"brk %[imm]" :: [imm] "i" (BUG_BRK_IMM)	\

	);





#define BUG() do {					\

	_BUG_FLAGS(0);				\

	__BUG_FLAGS(0);					\

	unreachable();					\

} while (0)



#define __WARN_TAINT(taint) _BUG_FLAGS(BUGFLAG_TAINT(taint))

#define __WARN_TAINT(taint) 				\

	__BUG_FLAGS(BUGFLAG_TAINT(taint))



#endif /* ! CONFIG_GENERIC_BUG */

#define HAVE_ARCH_BUG



#include <asm-generic/bug.h>