aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlauber Costa <glommer@parallels.com>2011-12-14 23:34:31 +0000
committerDavid S. Miller <davem@davemloft.net>2011-12-15 11:59:44 -0500
commit888bdaa9b2c426dcca214e6efd388080938082cb (patch)
tree4f9d9ae8e99318effaaf4e12391cddecd4c9e9da
parentinet: remove rcu protection on tw_net (diff)
downloadlinux-dev-888bdaa9b2c426dcca214e6efd388080938082cb.tar.xz
linux-dev-888bdaa9b2c426dcca214e6efd388080938082cb.zip
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>
-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)
}
#endif
-#ifdef CONFIG_INET
enum {
UNDER_LIMIT,
SOFT_LIMIT,
OVER_LIMIT,
};
+#ifdef CONFIG_INET
struct sock;
#ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM
void sock_update_memcg(struct sock *sk);