From 43a93010d75ae5b82d3d12115d45d079172f3508 Mon Sep 17 00:00:00 2001
From: Michal Hocko <mhocko@suse.cz>
Date: Thu, 5 Apr 2012 14:25:16 -0700
Subject: [PATCH] --- yaml --- r: 298659 b: refs/heads/master c:
 dac23b0d0513916498d40412818bd2c581b365f7 h: refs/heads/master i:   298657:
 79ebcec5db8f0ed7aae4f1aaa8e2de8de248b072   298655:
 840608c5fc157d703b3c6137ce081b488e2e897b v: v3

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

diff --git a/[refs] b/[refs]
index ec3010bbf09b..e3d21ca6b4d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ede3d832aaa038e7465e677569f7acc96b4dcdf
+refs/heads/master: dac23b0d0513916498d40412818bd2c581b365f7
diff --git a/trunk/include/linux/swap.h b/trunk/include/linux/swap.h
index 8dc0ea7caf02..b1fd5c7925fe 100644
--- a/trunk/include/linux/swap.h
+++ b/trunk/include/linux/swap.h
@@ -305,6 +305,13 @@ static inline int mem_cgroup_swappiness(struct mem_cgroup *mem)
 	return vm_swappiness;
 }
 #endif
+#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP
+extern void mem_cgroup_uncharge_swap(swp_entry_t ent);
+#else
+static inline void mem_cgroup_uncharge_swap(swp_entry_t ent)
+{
+}
+#endif
 #ifdef CONFIG_SWAP
 /* linux/mm/page_io.c */
 extern int swap_readpage(struct page *);
@@ -375,13 +382,6 @@ mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent, bool swapout)
 {
 }
 #endif
-#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP
-extern void mem_cgroup_uncharge_swap(swp_entry_t ent);
-#else
-static inline void mem_cgroup_uncharge_swap(swp_entry_t ent)
-{
-}
-#endif
 
 #else /* CONFIG_SWAP */