--- v3
+++ v2
@@ -38,10 +38,10 @@
3 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/include/linux/rmap.h b/include/linux/rmap.h
-index 733d3d8181e2..d91be69c1c60 100644
+index 43ef2c30cb0f..f5cd4dbc78b0 100644
--- a/include/linux/rmap.h
+++ b/include/linux/rmap.h
-@@ -173,8 +173,16 @@ void page_add_anon_rmap(struct page *, struct vm_area_struct *,
+@@ -170,8 +170,16 @@ void page_add_anon_rmap(struct page *, struct vm_area_struct *,
unsigned long, bool);
void do_page_add_anon_rmap(struct page *, struct vm_area_struct *,
unsigned long, int);
@@ -61,10 +61,10 @@
void page_remove_rmap(struct page *, bool);
diff --git a/mm/memory.c b/mm/memory.c
-index a5b5fe833ed3..479b47a8ed7c 100644
+index 9f9e5bb7a556..51bc8315281e 100644
--- a/mm/memory.c
+++ b/mm/memory.c
-@@ -2508,7 +2508,7 @@ static int wp_page_copy(struct vm_fault *vmf)
+@@ -2376,7 +2376,7 @@ static int wp_page_copy(struct vm_fault *vmf)
* thread doing COW.
*/
ptep_clear_flush_notify(vma, vmf->address, vmf->pte);
@@ -73,7 +73,7 @@
mem_cgroup_commit_charge(new_page, memcg, false, false);
__lru_cache_add_active_or_unevictable(new_page, vmf->vma_flags);
/*
-@@ -2998,7 +2998,7 @@ int do_swap_page(struct vm_fault *vmf)
+@@ -2847,7 +2847,7 @@ int do_swap_page(struct vm_fault *vmf)
mem_cgroup_commit_charge(page, memcg, true, false);
activate_page(page);
} else { /* ksm created a completely new copy */
@@ -82,7 +82,7 @@
mem_cgroup_commit_charge(page, memcg, false, false);
__lru_cache_add_active_or_unevictable(page, vmf->vma_flags);
}
-@@ -3144,7 +3144,7 @@ static int do_anonymous_page(struct vm_fault *vmf)
+@@ -2985,7 +2985,7 @@ static int do_anonymous_page(struct vm_fault *vmf)
}
inc_mm_counter_fast(vma->vm_mm, MM_ANONPAGES);
@@ -91,7 +91,7 @@
mem_cgroup_commit_charge(page, memcg, false, false);
__lru_cache_add_active_or_unevictable(page, vmf->vma_flags);
setpte:
-@@ -3396,7 +3396,7 @@ int alloc_set_pte(struct vm_fault *vmf, struct mem_cgroup *memcg,
+@@ -3237,7 +3237,7 @@ int alloc_set_pte(struct vm_fault *vmf, struct mem_cgroup *memcg,
/* copy-on-write page */
if (write && !(vmf->vma_flags & VM_SHARED)) {
inc_mm_counter_fast(vma->vm_mm, MM_ANONPAGES);
@@ -101,10 +101,10 @@
__lru_cache_add_active_or_unevictable(page, vmf->vma_flags);
} else {
diff --git a/mm/rmap.c b/mm/rmap.c
-index b874c4761e84..5d657329191e 100644
+index c1286d47aa1f..0c9f8ded669a 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
-@@ -1133,7 +1133,7 @@ void do_page_add_anon_rmap(struct page *page,
+@@ -1122,7 +1122,7 @@ void do_page_add_anon_rmap(struct page *page,
}
/**
@@ -113,7 +113,7 @@
* @page: the page to add the mapping to
* @vma: the vm area in which the mapping is added
* @address: the user virtual address mapped
-@@ -1143,12 +1143,11 @@ void do_page_add_anon_rmap(struct page *page,
+@@ -1132,12 +1132,11 @@ void do_page_add_anon_rmap(struct page *page,
* This means the inc-and-test can be bypassed.
* Page does not have to be locked.
*/