Commit c837de38 authored by Peter Zijlstra's avatar Peter Zijlstra
Browse files

unreachable: Unify 



Since barrier_before_unreachable() is empty for !GCC it is trivial to
unify the two definitions. Less is more.

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarJosh Poimboeuf <jpoimboe@kernel.org>
Link: https://lore.kernel.org/r/20241128094311.924381359@infradead.org
parent bb817006

include/linux/compiler-gcc.h

+0 −12
Original line number Diff line number Diff line
@@ -52,18 +52,6 @@ 
 */

#define barrier_before_unreachable() asm volatile("")



/*

 * Mark a position in code as unreachable.  This can be used to

 * suppress control flow warnings after asm blocks that transfer

 * control elsewhere.

 */

#define unreachable() \

	do {					\

		annotate_unreachable();		\

		barrier_before_unreachable();	\

		__builtin_unreachable();	\

	} while (0)



#if defined(CONFIG_ARCH_USE_BUILTIN_BSWAP)

#define __HAVE_BUILTIN_BSWAP32__

#define __HAVE_BUILTIN_BSWAP64__

include/linux/compiler.h

+7 −3
Original line number Diff line number Diff line
@@ -141,12 +141,16 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val, 
#define __annotate_jump_table

#endif /* CONFIG_OBJTOOL */



#ifndef unreachable

/*

 * Mark a position in code as unreachable.  This can be used to

 * suppress control flow warnings after asm blocks that transfer

 * control elsewhere.

 */

#define unreachable() do {		\

	annotate_unreachable();		\

	barrier_before_unreachable();	\

	__builtin_unreachable();	\

} while (0)

#endif



/*

 * KENTRY - kernel entry point