From 9411d27783f603b5473f8b2f484bb103d3b382ed Mon Sep 17 00:00:00 2001
From: Hyesoo Yu <hyesoo.yu@samsung.com>
Date: Mon, 6 Jul 2020 16:00:01 +0900
Subject: [PATCH] ANDROID: mm: add vendor padding for SPECULATIVE_PAGE_FAULTS

Fields are added on mm_struct, vm_area_struct and vm_fault
to support vendor feature, speculative page fault.

Bug: 155842923
Change-Id: Iedda086d6f83f1353da5a2ed1e24f7ba7dde43f2
Merged-In: Iedda086d6f83f1353da5a2ed1e24f7ba7dde43f2
Signed-off-by: Hyesoo Yu <hyesoo.yu@samsung.com>
---
 include/linux/mm.h       | 3 +++
 include/linux/mm_types.h | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/include/linux/mm.h b/include/linux/mm.h
index a33a505c03c9..2f821accb850 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -28,6 +28,7 @@
 #include <linux/overflow.h>
 #include <linux/sizes.h>
 #include <linux/android_kabi.h>
+#include <linux/android_vendor.h>
 
 struct mempolicy;
 struct anon_vma;
@@ -453,6 +454,8 @@ struct vm_fault {
 					 */
 	unsigned long vma_flags;	/* Speculative Page Fault field */
 	pgprot_t vma_page_prot;		/* Speculative Page Fault field */
+	ANDROID_VENDOR_DATA(1);
+	ANDROID_VENDOR_DATA(2);
 };
 
 /* page entry size for vm->huge_fault() */
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 533d73c47c0f..3cb63ac546be 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -15,6 +15,7 @@
 #include <linux/page-flags-layout.h>
 #include <linux/workqueue.h>
 #include <linux/android_kabi.h>
+#include <linux/android_vendor.h>
 
 #include <asm/mmu.h>
 
@@ -366,6 +367,7 @@ struct vm_area_struct {
 	ANDROID_KABI_RESERVE(2);
 	ANDROID_KABI_RESERVE(3);
 	ANDROID_KABI_RESERVE(4);
+	ANDROID_VENDOR_DATA(1);
 } __randomize_layout;
 
 struct core_thread {
@@ -537,6 +539,7 @@ struct mm_struct {
 		atomic_long_t hugetlb_usage;
 #endif
 		struct work_struct async_put_work;
+		ANDROID_VENDOR_DATA(1);
 	} __randomize_layout;
 
 	/*