From: "ndesaulniers@google.com" ndesaulniers@google.com

commit 8bd66d147c88bd441178c7b4c774ae5a185f19b8 upstream.

asm_volatile_goto should also be defined for other compilers that support asm goto.

Fixes commit 815f0ddb346c ("include/linux/compiler*.h: make compiler-*.h mutually exclusive").

Signed-off-by: Nick Desaulniers ndesaulniers@google.com Signed-off-by: Miguel Ojeda miguel.ojeda.sandonis@gmail.com Signed-off-by: Nathan Chancellor natechancellor@gmail.com ---

Hi Greg and Sasha,

Please pick up this patch for 4.19. It turns out that commit 13aceef06adf ("arm64: jump_label.h: use asm_volatile_goto macro instead of "asm goto"") was backported without this, which causes a build failure on arm64. This wasn't uncovered until now because clang didn't support asm goto so this code wasn't being compiled. Thankfully, that should change very soon :)

include/linux/compiler_types.h | 4 ++++ 1 file changed, 4 insertions(+)

diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h index db192becfec4..c2ded31a4cec 100644 --- a/include/linux/compiler_types.h +++ b/include/linux/compiler_types.h @@ -151,6 +151,10 @@ struct ftrace_likely_data { #define __assume_aligned(a, ...) #endif

+#ifndef asm_volatile_goto +#define asm_volatile_goto(x...) asm goto(x) +#endif + /* Are two types/vars the same type (ignoring qualifiers)? */ #define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))