Starting with version 4.5, GCC has a new built-in function __builtin_unreachable() that can be used in places like the kernel's BUG() where inline assembly is used to transfer control flow. This eliminated the need for an endless loop in these places. The patch adds a new macro 'unreachable()' that will expand to either __builtin_unreachable() or an endless loop depending on the compiler version. Signed-off-by: David Daney <ddaney@xxxxxxxxxxxxxxxxxx> CC: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CC: Ingo Molnar <mingo@xxxxxxxxxx> CC: "H. Peter Anvin" <hpa@xxxxxxxxx> CC: x86@xxxxxxxxxx CC: ralf@xxxxxxxxxxxxxx CC: linux-mips@xxxxxxxxxxxxxx CC: Martin Schwidefsky <schwidefsky@xxxxxxxxxx> CC: Heiko Carstens <heiko.carstens@xxxxxxxxxx> CC: linux390@xxxxxxxxxx CC: linux-s390@xxxxxxxxxxxxxxx CC: David Howells <dhowells@xxxxxxxxxx> CC: Koichi Yasutake <yasutake.koichi@xxxxxxxxxxxxxxxx> CC: linux-am33-list@xxxxxxxxxx CC: Kyle McMartin <kyle@xxxxxxxxxxx> CC: Helge Deller <deller@xxxxxx> CC: linux-parisc@xxxxxxxxxxxxxxx CC: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> CC: Paul Mackerras <paulus@xxxxxxxxx> CC: linuxppc-dev@xxxxxxxxxx CC: Richard Henderson <rth@xxxxxxxxxxx> CC: Ivan Kokshaysky <ink@xxxxxxxxxxxxxxxxxxxx> CC: linux-alpha@xxxxxxxxxxxxxxx CC: Haavard Skinnemoen <hskinnemoen@xxxxxxxxx> CC: Mike Frysinger <vapier@xxxxxxxxxx> CC: uclinux-dist-devel@xxxxxxxxxxxxxxxxxxxx --- include/linux/compiler-gcc4.h | 14 ++++++++++++++ include/linux/compiler.h | 5 +++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h index 450fa59..ab3af40 100644 --- a/include/linux/compiler-gcc4.h +++ b/include/linux/compiler-gcc4.h @@ -36,4 +36,18 @@ the kernel context */ #define __cold __attribute__((__cold__)) + +#if __GNUC_MINOR__ >= 5 +/* + * Mark a position in code as unreachable. This can be used to + * suppress control flow warnings after asm blocks that transfer + * control elsewhere. + * + * Early snapshots of gcc 4.5 don't support this and we can't detect + * this in the preprocessor, but we can live with this because they're + * unreleased. Really, we need to have autoconf for the kernel. + */ +#define unreachable() __builtin_unreachable() +#endif + #endif diff --git a/include/linux/compiler.h b/include/linux/compiler.h index 04fb513..7efd73f 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -144,6 +144,11 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); # define barrier() __memory_barrier() #endif +/* Unreachable code */ +#ifndef unreachable +# define unreachable() do { for (;;) ; } while (0) +#endif + #ifndef RELOC_HIDE # define RELOC_HIDE(ptr, off) \ ({ unsigned long __ptr; \ -- 1.6.2.5