]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
includecheck fix: include/linux, page_cgroup.h
authorJaswinder Singh Rajput <jaswinderrajput@gmail.com>
Sun, 20 Sep 2009 10:50:44 +0000 (16:20 +0530)
committerJaswinder Singh Rajput <jaswinderrajput@gmail.com>
Sun, 20 Sep 2009 11:27:50 +0000 (16:57 +0530)
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>
include/linux/page_cgroup.h

index 13f126c89ae8f1e5e35355eff8b94e1c9095906e..ada779f2417846bcee829c5e4f33a42f79a76b73 100644 (file)
@@ -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)