diff options
| author | Kumar Kartikeya Dwivedi <memxor@gmail.com> | 2022-07-22 13:36:05 +0200 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2022-07-22 09:07:07 -0700 |
| commit | e423414375866a399ebbe55ed044acb39846e8bf (patch) | |
| tree | 31ab940b2ad0b697a66873aa577e6c83f0aa2219 /include/linux/btf_ids.h | |
| parent | ac7ac432a67eb5410be32a3bef0fb393058af537 (diff) | |
| download | lwn-e423414375866a399ebbe55ed044acb39846e8bf.tar.gz lwn-e423414375866a399ebbe55ed044acb39846e8bf.zip | |
bpf: Fix build error in case of !CONFIG_DEBUG_INFO_BTF
BTF_ID_FLAGS macro needs to be able to take 0 or 1 args, so make it a
variable argument. BTF_SET8_END is incorrect, it should just be empty.
Reported-by: kernel test robot <lkp@intel.com>
Fixes: ab21d6063c01 ("bpf: Introduce 8-byte BTF set")
Signed-off-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Link: https://lore.kernel.org/r/20220722113605.6513-1-memxor@gmail.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'include/linux/btf_ids.h')
| -rw-r--r-- | include/linux/btf_ids.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/btf_ids.h b/include/linux/btf_ids.h index 3cb0741e71d7..2aea877d644f 100644 --- a/include/linux/btf_ids.h +++ b/include/linux/btf_ids.h @@ -206,7 +206,7 @@ extern struct btf_id_set8 name; #define BTF_ID_LIST(name) static u32 __maybe_unused name[5]; #define BTF_ID(prefix, name) -#define BTF_ID_FLAGS(prefix, name, flags) +#define BTF_ID_FLAGS(prefix, name, ...) #define BTF_ID_UNUSED #define BTF_ID_LIST_GLOBAL(name, n) u32 __maybe_unused name[n]; #define BTF_ID_LIST_SINGLE(name, prefix, typename) static u32 __maybe_unused name[1]; @@ -215,7 +215,7 @@ extern struct btf_id_set8 name; #define BTF_SET_START_GLOBAL(name) static struct btf_id_set __maybe_unused name = { 0 }; #define BTF_SET_END(name) #define BTF_SET8_START(name) static struct btf_id_set8 __maybe_unused name = { 0 }; -#define BTF_SET8_END(name) static struct btf_id_set8 __maybe_unused name = { 0 }; +#define BTF_SET8_END(name) #endif /* CONFIG_DEBUG_INFO_BTF */ |