Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "ANDROID: GKI: mm: add struct/enum fields for SPECULATIVE_PAGE_FAULTS"

Browse source 
This reverts commit b85526df37.

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>
This commit is contained in:
Suren Baghdasaryan 2020-04-10 19:40:10 +00:00
parent c73cb2cce2
commit f892b39288
4 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/linux/mm.h
View file

@ -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() */

5
include/linux/mm_types.h
View file

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

2
include/linux/vm_event_item.h
View file

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

2
mm/vmstat.c
View file

@ -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 */