linux-next: build failure after merge of the iomem-mmap-vs-gup tree

[Stephen Rothwell]

Hi all,

After merging the iomem-mmap-vs-gup tree, today's linux-next build
(powerpc ppc64_defconfig) failed like this:


Caused by commit

  96667f8a4382 ("mm: Close race in generic_access_phys")

interacting with commit

  9fd6dad1261a ("mm: provide a saner PTE walking API for modules")

from the kvm tree.

I have applied the following merge fix patch for today.

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Wed, 10 Feb 2021 20:29:22 +1100
Subject: [PATCH] mm: fixup for follow_pte() API change

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 mm/memory.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mm/memory.c b/mm/memory.c
index b518bf4273d2..2c436e3a6259 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -4825,7 +4825,7 @@ int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
 		return -EINVAL;
 
 retry:
-	if (follow_pte(vma->vm_mm, addr, NULL, &ptep, NULL, &ptl))
+	if (follow_pte(vma->vm_mm, addr, &ptep, &ptl))
 		return -EINVAL;
 	pte = *ptep;
 	pte_unmap_unlock(ptep, ptl);
@@ -4840,7 +4840,7 @@ int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
 	if (!maddr)
 		return -ENOMEM;
 
-	if (follow_pte(vma->vm_mm, addr, NULL, &ptep, NULL, &ptl))
+	if (follow_pte(vma->vm_mm, addr, &ptep, &ptl))
 		goto out_unmap;
 
 	if (!pte_same(pte, *ptep)) {
-- 
2.30.0

-- 
Cheers,
Stephen Rothwell

Attachment: pgpUaScqfkgkv.pgp
Description: OpenPGP digital signature