diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c index 621db739be7a..9abf41cff3c2 100644 --- a/drivers/staging/android/lowmemorykiller.c +++ b/drivers/staging/android/lowmemorykiller.c @@ -147,8 +147,7 @@ void tune_lmk_zone_param(struct zonelist *zonelist, int classzone_idx, if (other_file != NULL) *other_file -= zone_page_state(zone, NR_FILE_PAGES) - - zone_page_state(zone, NR_SHMEM) - - zone_page_state(zone, NR_SWAPCACHE); + - zone_page_state(zone, NR_SHMEM); } else if (zone_idx < classzone_idx) { if (zone_watermark_ok(zone, 0, 0, classzone_idx, 0)) { if (!use_cma_pages) { diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index babc344d6259..46382ad15202 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -160,7 +160,6 @@ enum zone_stat_item { #endif NR_ANON_TRANSPARENT_HUGEPAGES, NR_FREE_CMA_PAGES, - NR_SWAPCACHE, NR_VM_ZONE_STAT_ITEMS }; /* diff --git a/mm/swap_state.c b/mm/swap_state.c index d5e7c29f0761..2e0e11345d5f 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -98,7 +98,6 @@ int __add_to_swap_cache(struct page *page, swp_entry_t entry) if (likely(!error)) { address_space->nrpages++; __inc_zone_page_state(page, NR_FILE_PAGES); - __inc_zone_page_state(page, NR_SWAPCACHE); INC_CACHE_INFO(add_total); } spin_unlock_irq(&address_space->tree_lock); @@ -151,7 +150,6 @@ void __delete_from_swap_cache(struct page *page) ClearPageSwapCache(page); address_space->nrpages--; __dec_zone_page_state(page, NR_FILE_PAGES); - __dec_zone_page_state(page, NR_SWAPCACHE); INC_CACHE_INFO(del_total); } diff --git a/mm/vmstat.c b/mm/vmstat.c index cddab5b10795..3cafd010467e 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -765,7 +765,6 @@ const char * const vmstat_text[] = { #endif "nr_anon_transparent_hugepages", "nr_free_cma", - "nr_swapcache", "nr_dirty_threshold", "nr_dirty_background_threshold",