summaryrefslogtreecommitdiffstats
path: root/samples/bpf
diff options
context:
space:
mode:
authorKP Singh <kpsingh@google.com>2019-10-02 21:16:52 +0200
committerDaniel Borkmann <daniel@iogearbox.net>2019-10-03 17:37:11 +0200
commit98beb3edeb974e906a81f305d88f7bc96b2ec83e (patch)
tree02d7e57bced7c34991f04553cff725e7c91613d5 /samples/bpf
parentdf551058f7a303bd3a17a4cef001349974962ce8 (diff)
downloadlinux-98beb3edeb974e906a81f305d88f7bc96b2ec83e.tar.gz
linux-98beb3edeb974e906a81f305d88f7bc96b2ec83e.tar.bz2
linux-98beb3edeb974e906a81f305d88f7bc96b2ec83e.zip
samples/bpf: Add a workaround for asm_inline
This was added in commit eb111869301e ("compiler-types.h: add asm_inline definition") and breaks samples/bpf as clang does not support asm __inline. Fixes: eb111869301e ("compiler-types.h: add asm_inline definition") Co-developed-by: Florent Revest <revest@google.com> Signed-off-by: Florent Revest <revest@google.com> Signed-off-by: KP Singh <kpsingh@google.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Acked-by: Song Liu <songliubraving@fb.com> Acked-by: Andrii Nakryiko <andriin@fb.com> Link: https://lore.kernel.org/bpf/20191002191652.11432-1-kpsingh@chromium.org
Diffstat (limited to 'samples/bpf')
-rw-r--r--samples/bpf/asm_goto_workaround.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/samples/bpf/asm_goto_workaround.h b/samples/bpf/asm_goto_workaround.h
index 7409722727ca..7048bb3594d6 100644
--- a/samples/bpf/asm_goto_workaround.h
+++ b/samples/bpf/asm_goto_workaround.h
@@ -3,7 +3,8 @@
#ifndef __ASM_GOTO_WORKAROUND_H
#define __ASM_GOTO_WORKAROUND_H
-/* this will bring in asm_volatile_goto macro definition
+/*
+ * This will bring in asm_volatile_goto and asm_inline macro definitions
* if enabled by compiler and config options.
*/
#include <linux/types.h>
@@ -13,5 +14,15 @@
#define asm_volatile_goto(x...) asm volatile("invalid use of asm_volatile_goto")
#endif
+/*
+ * asm_inline is defined as asm __inline in "include/linux/compiler_types.h"
+ * if supported by the kernel's CC (i.e CONFIG_CC_HAS_ASM_INLINE) which is not
+ * supported by CLANG.
+ */
+#ifdef asm_inline
+#undef asm_inline
+#define asm_inline asm
+#endif
+
#define volatile(x...) volatile("")
#endif