From f2f6a4239e15fb990f4cb884c757973f151741f8 Mon Sep 17 00:00:00 2001 From: Minchan Kim Date: Mon, 11 Mar 2019 11:37:42 +0900 Subject: [PATCH] Revert "mm: add speculative page fault vmstats" This reverts commit 2842d9234e61dc7ae96500caa4ad48320ba60147. Bug: 128240262 Change-Id: I3ba5c0ab739af15061dd376fcb15366e9644ed4f Signed-off-by: Minchan Kim [dereference23: Forward port to msm-5.4] Signed-off-by: Alexander Winkowski --- include/linux/vm_event_item.h | 3 --- mm/memory.c | 1 - mm/vmstat.c | 5 +---- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/include/linux/vm_event_item.h b/include/linux/vm_event_item.h index 0fa409e827bb..5a43dc19c317 100644 --- a/include/linux/vm_event_item.h +++ b/include/linux/vm_event_item.h @@ -113,9 +113,6 @@ enum vm_event_item { PGPGIN, PGPGOUT, #ifdef CONFIG_SWAP SWAP_RA, SWAP_RA_HIT, -#endif -#ifdef CONFIG_SPECULATIVE_PAGE_FAULT - SPECULATIVE_PGFAULT, #endif NR_VM_EVENT_ITEMS }; diff --git a/mm/memory.c b/mm/memory.c index 59885e20e165..b086424815fc 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4616,7 +4616,6 @@ int __handle_speculative_fault(struct mm_struct *mm, unsigned long address, * If there is no need to retry, don't return the vma to the caller. */ if (ret != VM_FAULT_RETRY) { - count_vm_event(SPECULATIVE_PGFAULT); put_vma(vmf.vma); *vma = NULL; } diff --git a/mm/vmstat.c b/mm/vmstat.c index 8c7e6e718a5f..10d281bfd71b 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -1300,10 +1300,7 @@ const char * const vmstat_text[] = { "swap_ra", "swap_ra_hit", #endif -#ifdef CONFIG_SPECULATIVE_PAGE_FAULT - "speculative_pgfault" -#endif -#endif /* CONFIG_VM_EVENT_COUNTERS */ +#endif /* CONFIG_VM_EVENTS_COUNTERS */ }; #endif /* CONFIG_PROC_FS || CONFIG_SYSFS || CONFIG_NUMA */