aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/memcontrol.h
diff options
context:
space:
mode:
authorGlauber Costa <glommer@parallels.com>2011-12-14 18:34:31 -0500
committerDavid S. Miller <davem@davemloft.net>2011-12-15 11:59:44 -0500
commit888bdaa9b2c426dcca214e6efd388080938082cb (patch)
tree4f9d9ae8e99318effaaf4e12391cddecd4c9e9da /include/linux/memcontrol.h
parentf943cbe6fb71d1389dd8684b9b4181e49f8e870c (diff)
Move limit definitions outside CONFIG_INET
They need to be available for other protocols as well, since they are used in sock.c openly Signed-off-by: Glauber Costa <glommer@parallels.com> CC: Hiroyouki Kamezawa <kamezawa.hiroyu@jp.fujitsu.com> CC: David S. Miller <davem@davemloft.net> CC: Eric Dumazet <eric.dumazet@gmail.com> CC: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/memcontrol.h')
-rw-r--r--include/linux/memcontrol.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 1513994ce207..9b296ea41bb8 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -384,13 +384,13 @@ mem_cgroup_print_bad_page(struct page *page)
384} 384}
385#endif 385#endif
386 386
387#ifdef CONFIG_INET
388enum { 387enum {
389 UNDER_LIMIT, 388 UNDER_LIMIT,
390 SOFT_LIMIT, 389 SOFT_LIMIT,
391 OVER_LIMIT, 390 OVER_LIMIT,
392}; 391};
393 392
393#ifdef CONFIG_INET
394struct sock; 394struct sock;
395#ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM 395#ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM
396void sock_update_memcg(struct sock *sk); 396void sock_update_memcg(struct sock *sk);