Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 97572751d78133cf9a5f7165b252bf975f9dd17d

Authored by Jaswinder Singh Rajput
1 parent 43cc960980
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

include/linux/page_cgroup.h
Diff comments   View file @ 9757275
... ... @@ -105,14 +105,14 @@
105 105  
106 106 #endif
107 107  
108   -#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP
109 108 #include <linux/swap.h>
  109 +
  110 +#ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP
110 111 extern unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id);
111 112 extern unsigned short lookup_swap_cgroup(swp_entry_t ent);
112 113 extern int swap_cgroup_swapon(int type, unsigned long max_pages);
113 114 extern void swap_cgroup_swapoff(int type);
114 115 #else
115   -#include <linux/swap.h>
116 116  
117 117 static inline
118 118 unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id)