On Tue 24-06-14 20:33:06, Vladimir Davydov wrote:
> Since commit a9ce315aaec1f ("mm: memcontrol: rewrite uncharge API"),
I guess the sha comes from linux-next. Andrew will probably just fold
this into mm-memcontrol-rewrite-uncharge-api.patch but the sha should be
removed otherwise.
> PCG_* flags are used as bit masks, but they are still defined in a enum
> as bit numbers. Fix it.
>
> Signed-off-by: Vladimir Davydov <vdavydov@xxxxxxxxxxxxx>
Acked-by: Michal Hocko <mhocko@xxxxxxx>
> ---
> include/linux/page_cgroup.h | 12 +++++-------
> 1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/include/linux/page_cgroup.h b/include/linux/page_cgroup.h
> index fb60e4a466c0..9065a61345a1 100644
> --- a/include/linux/page_cgroup.h
> +++ b/include/linux/page_cgroup.h
> @@ -1,12 +1,10 @@
> #ifndef __LINUX_PAGE_CGROUP_H
> #define __LINUX_PAGE_CGROUP_H
>
> -enum {
> - /* flags for mem_cgroup */
> - PCG_USED, /* This page is charged to a memcg */
> - PCG_MEM, /* This page holds a memory charge */
> - PCG_MEMSW, /* This page holds a memory+swap charge */
> -};
> +/* flags for mem_cgroup */
> +#define PCG_USED 0x01 /* This page is charged to a memcg */
> +#define PCG_MEM 0x02 /* This page holds a memory charge */
> +#define PCG_MEMSW 0x04 /* This page holds a memory+swap charge */
>
> struct pglist_data;
>
> @@ -44,7 +42,7 @@ struct page *lookup_cgroup_page(struct page_cgroup *pc);
>
> static inline int PageCgroupUsed(struct page_cgroup *pc)
> {
> - return test_bit(PCG_USED, &pc->flags);
> + return !!(pc->flags & PCG_USED);
> }
> #else /* !CONFIG_MEMCG */
> struct page_cgroup;
> --
> 1.7.10.4
>
--
Michal Hocko
SUSE Labs
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>