From f892b39288beca5eac22365ce4b432f842426b6a Mon Sep 17 00:00:00 2001
From: Suren Baghdasaryan <surenb@google.com>
Date: Fri, 10 Apr 2020 19:40:10 +0000
Subject: [PATCH] Revert "ANDROID: GKI: mm: add struct/enum fields for
 SPECULATIVE_PAGE_FAULTS"

This reverts commit b85526df37073d4def86f48c9be93d8ab170c28e.

Reason for revert: GKI does not support SPECULATIVE_PAGE_FAULTS until they are upstreamed.

Bug: 140544941
Change-Id: Ideeb6a11b8554618a20d736c3d8ca8b4ddcf6520
Test: build and compare ABI diffs
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
---
 include/linux/mm.h            | 4 ----
 include/linux/mm_types.h      | 5 -----
 include/linux/vm_event_item.h | 2 --
 mm/vmstat.c                   | 2 --
 4 files changed, 13 deletions(-)

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 12edfa2873d0..c06305ce27d5 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -357,8 +357,6 @@ struct vm_fault {
 	gfp_t gfp_mask;			/* gfp mask to be used for allocations */
 	pgoff_t pgoff;			/* Logical page offset based on vma */
 	unsigned long address;		/* Faulting virtual address */
-	unsigned int sequence;		/* Speculative Page Fault field */
-	pmd_t orig_pmd;			/* Speculative Page Fault field */
 	pmd_t *pmd;			/* Pointer to pmd entry matching
 					 * the 'address' */
 	pud_t *pud;			/* Pointer to pud entry matching
@@ -389,8 +387,6 @@ struct vm_fault {
 					 * page table to avoid allocation from
 					 * atomic context.
 					 */
-	unsigned long vma_flags;	/* Speculative Page Fault field */
-	pgprot_t vma_page_prot;		/* Speculative Page Fault field */
 };
 
 /* page entry size for vm->huge_fault() */
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index f01ff9994bae..3f6ab003e4bf 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -335,9 +335,6 @@ struct vm_area_struct {
 	struct mempolicy *vm_policy;	/* NUMA policy for the VMA */
 #endif
 	struct vm_userfaultfd_ctx vm_userfaultfd_ctx;
-
-	seqcount_t vm_sequence;		/* Speculative page fault field */
-	atomic_t vm_ref_count;		/* Speculative page fault field */
 } __randomize_layout;
 
 struct core_thread {
@@ -357,8 +354,6 @@ struct mm_struct {
 		struct vm_area_struct *mmap;		/* list of VMAs */
 		struct rb_root mm_rb;
 		u64 vmacache_seqnum;                   /* per-thread vmacache */
-
-		rwlock_t mm_rb_lock;	/* Speculative page fault field */
 #ifdef CONFIG_MMU
 		unsigned long (*get_unmapped_area) (struct file *filp,
 				unsigned long addr, unsigned long len,
diff --git a/include/linux/vm_event_item.h b/include/linux/vm_event_item.h
index 83ecc8762747..284df30ba355 100644
--- a/include/linux/vm_event_item.h
+++ b/include/linux/vm_event_item.h
@@ -110,8 +110,6 @@ enum vm_event_item { PGPGIN, PGPGOUT, PGPGOUTCLEAN, PSWPIN, PSWPOUT,
 		SWAP_RA,
 		SWAP_RA_HIT,
 #endif
-		SPECULATIVE_PGFAULT_ANON,	/* Speculative page fault field */
-		SPECULATIVE_PGFAULT_FILE,	/* Speculative page fault field */
 		NR_VM_EVENT_ITEMS
 };
 
diff --git a/mm/vmstat.c b/mm/vmstat.c
index 544c5213aca2..ac18931a50e2 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -1292,8 +1292,6 @@ const char * const vmstat_text[] = {
 	"swap_ra",
 	"swap_ra_hit",
 #endif
-	"speculative_pgfault_anon",
-	"speculative_pgfault_file",
 #endif /* CONFIG_VM_EVENTS_COUNTERS */
 };
 #endif /* CONFIG_PROC_FS || CONFIG_SYSFS || CONFIG_NUMA */