[PATCH] CGROUPS: includecheck fix for include/linux/page_cgroup.h

Paul Menage menage at google.com
Mon Aug 10 11:50:26 PDT 2009


On Sun, Aug 9, 2009 at 7:45 AM, Jaswinder Singh
Rajput<jaswinder at kernel.org> wrote:
>
> 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 at gmail.com>

Acked-by: Paul Menage <menage at google.com>

Thanks.

Paul

> ---
>  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 13f126c..ada779f 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)
>
>  #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)
> --
> 1.6.0.6
>
>
>


More information about the Containers mailing list