Message ID | 20210322215201.1097281-1-arnd@kernel.org |
---|---|
State | New |
Headers | show |
Series | bpf: avoid old-style declaration warnings | expand |
On Mon, Mar 22, 2021 at 10:52 PM Arnd Bergmann <arnd@kernel.org> wrote: > > From: Arnd Bergmann <arnd@arndb.de> > > gcc -Wextra wants type modifiers in the normal order: > > kernel/bpf/bpf_lsm.c:70:1: error: 'static' is not at beginning of declaration [-Werror=old-style-declaration] > 70 | const static struct bpf_func_proto bpf_bprm_opts_set_proto = { > | ^~~~~ > kernel/bpf/bpf_lsm.c:91:1: error: 'static' is not at beginning of declaration [-Werror=old-style-declaration] > 91 | const static struct bpf_func_proto bpf_ima_inode_hash_proto = { > | ^~~~~ > > Fixes: 3f6719c7b62f ("bpf: Add bpf_bprm_opts_set helper") > Fixes: 27672f0d280a ("bpf: Add a BPF helper for getting the IMA hash of an inode") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Thanks for fixing! Acked-by: KP Singh <kpsingh@kernel.org>
diff --git a/kernel/bpf/bpf_lsm.c b/kernel/bpf/bpf_lsm.c index 1622a44d1617..75b1c678d558 100644 --- a/kernel/bpf/bpf_lsm.c +++ b/kernel/bpf/bpf_lsm.c @@ -67,7 +67,7 @@ BPF_CALL_2(bpf_bprm_opts_set, struct linux_binprm *, bprm, u64, flags) BTF_ID_LIST_SINGLE(bpf_bprm_opts_set_btf_ids, struct, linux_binprm) -const static struct bpf_func_proto bpf_bprm_opts_set_proto = { +static const struct bpf_func_proto bpf_bprm_opts_set_proto = { .func = bpf_bprm_opts_set, .gpl_only = false, .ret_type = RET_INTEGER, @@ -88,7 +88,7 @@ static bool bpf_ima_inode_hash_allowed(const struct bpf_prog *prog) BTF_ID_LIST_SINGLE(bpf_ima_inode_hash_btf_ids, struct, inode) -const static struct bpf_func_proto bpf_ima_inode_hash_proto = { +static const struct bpf_func_proto bpf_ima_inode_hash_proto = { .func = bpf_ima_inode_hash, .gpl_only = false, .ret_type = RET_INTEGER,