From f63dfd804b85a8f2c3a747d8f8f6b18fd6305f7f Mon Sep 17 00:00:00 2001 From: Suren Baghdasaryan Date: Mon, 2 Mar 2020 17:22:27 -0800 Subject: [PATCH] ANDROID: GKI: mm: add struct vm_fault fields for SPECULATIVE_PAGE_FAULTS Two new fields in the struct vm_fault can't easily be excluded using CONFIG_SPECULATIVE_PAGE_FAULTS. Add them as padding to reduce the ABI diff between vendors which use SPECULATIVE_PAGE_FAULTS and ACK. This allows vendors to pick the SPECULATIVE_PAGE_FAULTS feature and still be ABI compatible with ACK. Bug: 153715905 Test: build Signed-off-by: Laurent Dufour Signed-off-by: Vinayak Menon Signed-off-by: Charan Teja Reddy (cherry picked from commit 47e3eb155848872a13ab6ef73a4d0eecac36ce66) [surenb: kept only struct vm_fault changes and dropped the rest] Signed-off-by: Suren Baghdasaryan Change-Id: I08dbe38f37fa3e8a0f96f71cb6b2dd8737221da5 --- include/linux/mm.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/linux/mm.h b/include/linux/mm.h index b07cbbe1bde0..a33a505c03c9 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -451,6 +451,8 @@ 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() */