aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
Diffstat (limited to 'mm')
-rw-r--r--mm/memcontrol.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 602207be9853..3dbff4dcde35 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -373,7 +373,6 @@ static void mem_cgroup_put(struct mem_cgroup *memcg);
373 373
374/* Writing them here to avoid exposing memcg's inner layout */ 374/* Writing them here to avoid exposing memcg's inner layout */
375#ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM 375#ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM
376#ifdef CONFIG_INET
377#include <net/sock.h> 376#include <net/sock.h>
378#include <net/ip.h> 377#include <net/ip.h>
379 378
@@ -420,6 +419,7 @@ void sock_release_memcg(struct sock *sk)
420 } 419 }
421} 420}
422 421
422#ifdef CONFIG_INET
423struct cg_proto *tcp_proto_cgroup(struct mem_cgroup *memcg) 423struct cg_proto *tcp_proto_cgroup(struct mem_cgroup *memcg)
424{ 424{
425 if (!memcg || mem_cgroup_is_root(memcg)) 425 if (!memcg || mem_cgroup_is_root(memcg))