---

yaml --- r: 163896 b: refs/heads/master c: 9757275 h: refs/heads/master v: v3
git-mirror · Sep 20, 2009 · 3db1e52 · 3db1e52
1 parent 0bd58aa
commit 3db1e52
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43cc960980760f58d1f49ecd39e8cbfb063d63e1
+refs/heads/master: 97572751d78133cf9a5f7165b252bf975f9dd17d
diff --git a/trunk/include/linux/page_cgroup.h b/trunk/include/linux/page_cgroup.h
@@ -105,14 +105,14 @@ static inline void __init page_cgroup_init_flatmem(void)
 
 #endif
 
-#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP
 #include <linux/swap.h>
+
+#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP
 extern unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id);
 extern unsigned short lookup_swap_cgroup(swp_entry_t ent);
 extern int swap_cgroup_swapon(int type, unsigned long max_pages);
 extern void swap_cgroup_swapoff(int type);
 #else
-#include <linux/swap.h>
 
 static inline
 unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id)