From 3db1e52416d5f7804c579354178e94ed302b8bd7 Mon Sep 17 00:00:00 2001 From: Jaswinder Singh Rajput Date: Sun, 20 Sep 2009 16:20:44 +0530 Subject: [PATCH] --- yaml --- r: 163896 b: refs/heads/master c: 97572751d78133cf9a5f7165b252bf975f9dd17d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/page_cgroup.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7bbf7eb6f4a9..eabd75a36841 100644 --- 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 index 13f126c89ae8..ada779f24178 100644 --- 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 + +#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 static inline unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id)