From c5a23fd774870f1dd58b688be592025a50dbf40d Mon Sep 17 00:00:00 2001
From: Glauber Costa <glommer@parallels.com>
Date: Wed, 14 Dec 2011 23:34:31 +0000
Subject: [PATCH] --- yaml --- r: 278795 b: refs/heads/master c:
 888bdaa9b2c426dcca214e6efd388080938082cb h: refs/heads/master i:   278793:
 28bbf698b424366377f668226266fc144cbae596   278791:
 b59cdaa19020e84fe9bb0515608211465c892dbc v: v3

---
 [refs]                           | 2 +-
 trunk/include/linux/memcontrol.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 26a3a681b6dc..875de226601e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f943cbe6fb71d1389dd8684b9b4181e49f8e870c
+refs/heads/master: 888bdaa9b2c426dcca214e6efd388080938082cb
diff --git a/trunk/include/linux/memcontrol.h b/trunk/include/linux/memcontrol.h
index 1513994ce207..9b296ea41bb8 100644
--- a/trunk/include/linux/memcontrol.h
+++ b/trunk/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);