fix up mm patch for 4.19 and 4.20

diff --git a/queue-4.19/mm-memcg-fix-reclaim-deadlock-with-writeback.patch b/queue-4.19/mm-memcg-fix-reclaim-deadlock-with-writeback.patch
index 78ffc8b90565e602a7cf972aff3f47ddfadb4962..ca089947b353aea4f0763f160c54db1d761de779 100644 (file)
--- a/queue-4.19/mm-memcg-fix-reclaim-deadlock-with-writeback.patch
+++ b/queue-4.19/mm-memcg-fix-reclaim-deadlock-with-writeback.patch
@@ -110,12 +110,12 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
- mm/memory.c |   22 ++++++++++++++++++++++
- 1 file changed, 22 insertions(+)
+ mm/memory.c |   23 +++++++++++++++++++++++
+ 1 file changed, 23 insertions(+)
 
 --- a/mm/memory.c
 +++ b/mm/memory.c
-@@ -3237,6 +3237,28 @@ static vm_fault_t __do_fault(struct vm_f
+@@ -3237,6 +3237,29 @@ static vm_fault_t __do_fault(struct vm_f
        struct vm_area_struct *vma = vmf->vma;
        vm_fault_t ret;
  
@@ -135,7 +135,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +       *                              # flush A, B to clear the writeback
 +       */
 +      if (pmd_none(*vmf->pmd) && !vmf->prealloc_pte) {
-+              vmf->prealloc_pte = pte_alloc_one(vmf->vma->vm_mm);
++              vmf->prealloc_pte = pte_alloc_one(vmf->vma->vm_mm,
++                                                vmf->address);
 +              if (!vmf->prealloc_pte)
 +                      return VM_FAULT_OOM;
 +              smp_wmb(); /* See comment in __pte_alloc() */

diff --git a/queue-4.20/mm-memcg-fix-reclaim-deadlock-with-writeback.patch b/queue-4.20/mm-memcg-fix-reclaim-deadlock-with-writeback.patch
index 4392191622ab9aa740fbe1c4fb9bc70761feba6d..5e85a6b582d2821a6f12a67886505a8cfc024528 100644 (file)
--- a/queue-4.20/mm-memcg-fix-reclaim-deadlock-with-writeback.patch
+++ b/queue-4.20/mm-memcg-fix-reclaim-deadlock-with-writeback.patch
@@ -110,12 +110,12 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
- mm/memory.c |   22 ++++++++++++++++++++++
- 1 file changed, 22 insertions(+)
+ mm/memory.c |   23 +++++++++++++++++++++++
+ 1 file changed, 23 insertions(+)
 
 --- a/mm/memory.c
 +++ b/mm/memory.c
-@@ -2993,6 +2993,28 @@ static vm_fault_t __do_fault(struct vm_f
+@@ -2993,6 +2993,29 @@ static vm_fault_t __do_fault(struct vm_f
        struct vm_area_struct *vma = vmf->vma;
        vm_fault_t ret;
  
@@ -135,7 +135,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +       *                              # flush A, B to clear the writeback
 +       */
 +      if (pmd_none(*vmf->pmd) && !vmf->prealloc_pte) {
-+              vmf->prealloc_pte = pte_alloc_one(vmf->vma->vm_mm);
++              vmf->prealloc_pte = pte_alloc_one(vmf->vma->vm_mm,
++                                                vmf->address);
 +              if (!vmf->prealloc_pte)
 +                      return VM_FAULT_OOM;
 +              smp_wmb(); /* See comment in __pte_alloc() */