[1/2] Move limit definitions outside CONFIG_INET

Submitted by Glauber Costa on Dec. 15, 2011, 9:34 a.m.

Details

Message ID 1323941672-14324-2-git-send-email-glommer@parallels.com
State Accepted
Delegated to: David Miller
Headers show

Commit Message

Glauber Costa Dec. 15, 2011, 9:34 a.m.
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>
---
 include/linux/memcontrol.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

David Miller Dec. 15, 2011, 4:59 p.m.
From: Glauber Costa <glommer@parallels.com>
Date: Thu, 15 Dec 2011 13:34:31 +0400

> 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>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch hide | download patch | download mbox

diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 1513994..9b296ea 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);