From: Andrew Morton Cc: Christoph Lameter Signed-off-by: Andrew Morton --- include/linux/vmstat.h | 2 -- mm/vmscan.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff -puN include/linux/vmstat.h~zoned-vm-counters-convert-nr_mapped-to-per-zone-counter-fix include/linux/vmstat.h --- a/include/linux/vmstat.h~zoned-vm-counters-convert-nr_mapped-to-per-zone-counter-fix +++ a/include/linux/vmstat.h @@ -26,8 +26,6 @@ struct page_state { unsigned long nr_writeback; /* Pages under writeback */ unsigned long nr_unstable; /* NFS unstable pages */ unsigned long nr_page_table_pages;/* Pages used for pagetables */ - unsigned long nr_mapped; /* mapped into pagetables. - * only modified from process context */ unsigned long nr_slab; /* In slab */ #define GET_PAGE_STATE_LAST nr_slab diff -puN mm/vmscan.c~zoned-vm-counters-convert-nr_mapped-to-per-zone-counter-fix mm/vmscan.c --- a/mm/vmscan.c~zoned-vm-counters-convert-nr_mapped-to-per-zone-counter-fix +++ a/mm/vmscan.c @@ -1407,7 +1407,7 @@ unsigned long shrink_all_memory(unsigned for (prio = DEF_PRIORITY; prio >= 0; prio--) { unsigned long nr_to_scan = nr_pages - ret; - sc.nr_mapped = read_page_state(nr_mapped); + sc.nr_mapped = global_page_state(NR_FILE_MAPPED); sc.nr_scanned = 0; ret += shrink_all_zones(nr_to_scan, prio, pass, &sc); _