Commit dfcdf0e9 authored by YiFei Zhu's avatar YiFei Zhu Committed by Alexei Starovoitov
Browse files

bpf/local_storage: Fix build without CONFIG_CGROUP 



local_storage.o has its compile guard as CONFIG_BPF_SYSCALL, which
does not imply that CONFIG_CGROUP is on. Including cgroup-internal.h
when CONFIG_CGROUP is off cause a compilation failure.

Fixes: f67cfc233706 ("bpf: Make cgroup storages shared between programs on the same cgroup")
Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarYiFei Zhu <zhuyifei@google.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20200724211753.902969-1-zhuyifei1999@gmail.com
parent 36f72484

kernel/bpf/local_storage.c

+2 −2
Original line number Diff line number Diff line
@@ -9,12 +9,12 @@ 
#include <linux/slab.h>

#include <uapi/linux/btf.h>



#include "../cgroup/cgroup-internal.h"



DEFINE_PER_CPU(struct bpf_cgroup_storage*, bpf_cgroup_storage[MAX_BPF_CGROUP_STORAGE_TYPE]);



#ifdef CONFIG_CGROUP_BPF



#include "../cgroup/cgroup-internal.h"



#define LOCAL_STORAGE_CREATE_FLAG_MASK					\

	(BPF_F_NUMA_NODE | BPF_F_ACCESS_MASK)