Piteball/android_kernel_samsung_msm8976
1
1
Fork 0
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git synced 2024-10-31 18:09:19 +00:00
Code Issues Projects Releases Wiki Activity

Revert "lowmemorykiller: Don't count swap cache pages twice"

Browse source 
This reverts commit 52acbe414c1643066b299c1e9cdae7f4f188d419.
This commit is contained in:
Thierry Strudel 2015-12-22 10:07:00 -08:00 committed by syphyr
parent 9174c4f83f
commit 200ed15225
4 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/staging/android/lowmemorykiller.c
View file

@ -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) {

1
include/linux/mmzone.h
View file

@ -160,7 +160,6 @@ enum zone_stat_item {
#endif
NR_ANON_TRANSPARENT_HUGEPAGES,
NR_FREE_CMA_PAGES,
NR_SWAPCACHE,
NR_VM_ZONE_STAT_ITEMS };
/*

2
mm/swap_state.c
View file

@ -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);
}

1
mm/vmstat.c
View file

@ -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",