diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 9b296ea41bb85a5543c915dad41748c59fdd1734..f944591765eba3be0904bc820c4063c3c73183fd 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -390,7 +390,6 @@ enum { OVER_LIMIT, }; -#ifdef CONFIG_INET struct sock; #ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM void sock_update_memcg(struct sock *sk); @@ -403,6 +402,5 @@ static inline void sock_release_memcg(struct sock *sk) { } #endif /* CONFIG_CGROUP_MEM_RES_CTLR_KMEM */ -#endif /* CONFIG_INET */ #endif /* _LINUX_MEMCONTROL_H */ diff --git a/net/core/sock.c b/net/core/sock.c index c3ae73de023993c2a2ce94b1d8bbde1af99617ba..5c5af9988f941c9ee4eef4769127d3ce21f2f8cd 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -112,6 +112,7 @@ #include #include #include +#include #include #include