diff options
author | Jaswinder Singh Rajput <jaswinderrajput@gmail.com> | 2009-09-20 06:50:44 -0400 |
---|---|---|
committer | Jaswinder Singh Rajput <jaswinderrajput@gmail.com> | 2009-09-20 07:27:50 -0400 |
commit | 97572751d78133cf9a5f7165b252bf975f9dd17d (patch) | |
tree | 28391f48e94912700f47f14f0eb5b3ed8756e29e /include | |
parent | 43cc960980760f58d1f49ecd39e8cbfb063d63e1 (diff) |
includecheck fix: include/linux, page_cgroup.h
fix the following 'make includecheck' warning:
include/linux/page_cgroup.h: linux/swap.h is included more than once.
Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Cc: Li Zefan <lizf@cn.fujitsu.com>
Acked-by: Paul Menage <menage@google.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/page_cgroup.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/page_cgroup.h b/include/linux/page_cgroup.h index 13f126c89ae8..ada779f24178 100644 --- a/include/linux/page_cgroup.h +++ b/include/linux/page_cgroup.h | |||
@@ -105,14 +105,14 @@ static inline void __init page_cgroup_init_flatmem(void) | |||
105 | 105 | ||
106 | #endif | 106 | #endif |
107 | 107 | ||
108 | #ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP | ||
109 | #include <linux/swap.h> | 108 | #include <linux/swap.h> |
109 | |||
110 | #ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP | ||
110 | extern unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id); | 111 | extern unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id); |
111 | extern unsigned short lookup_swap_cgroup(swp_entry_t ent); | 112 | extern unsigned short lookup_swap_cgroup(swp_entry_t ent); |
112 | extern int swap_cgroup_swapon(int type, unsigned long max_pages); | 113 | extern int swap_cgroup_swapon(int type, unsigned long max_pages); |
113 | extern void swap_cgroup_swapoff(int type); | 114 | extern void swap_cgroup_swapoff(int type); |
114 | #else | 115 | #else |
115 | #include <linux/swap.h> | ||
116 | 116 | ||
117 | static inline | 117 | static inline |
118 | unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id) | 118 | unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id) |