On Sun 06-08-17 17:04:09, Stefan Agner wrote:
> After the move of slab statistics from zone to node counters some
> users still try to get the counters from the zone counters. This has
> been caught while compiling with clang printing a warning like:
>
> implicit conversion from enumeration type 'enum node_stat_item' to
> different enumeration type 'enum zone_stat_item' [-Wenum-conversion]
>
> Fixes: 385386cff4 ("mm: vmstat: move slab statistics from zone to node
> counters")
> Signed-off-by: Stefan Agner <ste...@agner.ch>
Johannes has posted the fix already
http://lkml.kernel.org/r/20170801134256.5400-1-han...@cmpxchg.org
Thanks!
> ---
> kernel/power/snapshot.c | 2 +-
> mm/page_alloc.c | 8 ++++----
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
> index 222317721c5a..0972a8e09d08 100644
> --- a/kernel/power/snapshot.c
> +++ b/kernel/power/snapshot.c
> @@ -1650,7 +1650,7 @@ static unsigned long minimum_image_size(unsigned long
> saveable)
> {
> unsigned long size;
>
> - size = global_page_state(NR_SLAB_RECLAIMABLE)
> + size = global_node_page_state(NR_SLAB_RECLAIMABLE)
> + global_node_page_state(NR_ACTIVE_ANON)
> + global_node_page_state(NR_INACTIVE_ANON)
> + global_node_page_state(NR_ACTIVE_FILE)
> diff --git a/mm/page_alloc.c b/mm/page_alloc.c
> index 6d30e914afb6..10aa91b58487 100644
> --- a/mm/page_alloc.c
> +++ b/mm/page_alloc.c
> @@ -4458,8 +4458,8 @@ long si_mem_available(void)
> * Part of the reclaimable slab consists of items that are in use,
> * and cannot be freed. Cap this estimate at the low watermark.
> */
> - available += global_page_state(NR_SLAB_RECLAIMABLE) -
> - min(global_page_state(NR_SLAB_RECLAIMABLE) / 2, wmark_low);
> + available += global_node_page_state(NR_SLAB_RECLAIMABLE) -
> + min(global_node_page_state(NR_SLAB_RECLAIMABLE) / 2,
> wmark_low);
>
> if (available < 0)
> available = 0;
> @@ -4602,8 +4602,8 @@ void show_free_areas(unsigned int filter, nodemask_t
> *nodemask)
> global_node_page_state(NR_FILE_DIRTY),
> global_node_page_state(NR_WRITEBACK),
> global_node_page_state(NR_UNSTABLE_NFS),
> - global_page_state(NR_SLAB_RECLAIMABLE),
> - global_page_state(NR_SLAB_UNRECLAIMABLE),
> + global_node_page_state(NR_SLAB_RECLAIMABLE),
> + global_node_page_state(NR_SLAB_UNRECLAIMABLE),
> global_node_page_state(NR_FILE_MAPPED),
> global_node_page_state(NR_SHMEM),
> global_page_state(NR_PAGETABLE),
> --
> 2.13.3
>
> --
> To unsubscribe, send a message with 'unsubscribe linux-mm' in
> the body to majord...@kvack.org. For more info on Linux MM,
> see: http://www.linux-mm.org/ .
> Don't email: <a href=mailto:"d...@kvack.org";> em...@kvack.org </a>
--
Michal Hocko
SUSE Labs
