Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 25 May 2020 22:17:00 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Andrew Morton <akpm@linux-foundation.org>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        John Hubbard <jhubbard@nvidia.com>,
        Michel Lespinasse <walken@google.com>
Subject: linux-next: build failure after merge of the akpm tree
Message-ID: <20200525221700.0aa347f7@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Dr7XEb5Vh9NKhV2ex.+CD5f";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/Dr7XEb5Vh9NKhV2ex.+CD5f
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

After merging the akpm tree, today's linux-next build (x86_64
allmodconfig) failed like this:

In file included from include/linux/kernel.h:14,
                 from mm/gup.c:2:
mm/gup.c: In function 'internal_get_user_pages_fast':
mm/gup.c:2732:33: error: 'struct mm_struct' has no member named 'mmap_sem';=
 did you mean 'mmap_base'?
 2732 |   might_lock_read(&current->mm->mmap_sem);
      |                                 ^~~~~~~~

Caused by commit

  64fe66e8a95e ("mmap locking API: rename mmap_sem to mmap_lock")

fron the akpm tree interacting with commit

  b1fc8b5ddb4e ("mm/gup: might_lock_read(mmap_sem) in get_user_pages_fast()=
")

from the akpm-current tree.

I added the following patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 25 May 2020 22:11:51 +1000
Subject: [PATCH] mm/gup: update for mmap_sem rename

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 mm/gup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/gup.c b/mm/gup.c
index 8977e5fe9843..f4bca3de0b4b 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -2729,7 +2729,7 @@ static int internal_get_user_pages_fast(unsigned long=
 start, int nr_pages,
 		return -EINVAL;
=20
 	if (!(gup_flags & FOLL_FAST_ONLY))
-		might_lock_read(&current->mm->mmap_sem);
+		might_lock_read(&current->mm->mmap_lock);
=20
 	start =3D untagged_addr(start) & PAGE_MASK;
 	addr =3D start;
--=20
2.26.2

--=20
Cheers,
Stephen Rothwell

--Sig_/Dr7XEb5Vh9NKhV2ex.+CD5f
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl7LtzwACgkQAVBC80lX
0GxCqAf8CMQxqEoEeB0A9cquiky5dJtTg8uOtMvLSuKnwgwU2PC/PXw28rohfJcU
OpWtNENKV20HsCQ8L4fp5i/0DFOe2Y8GInsVgIUiEqjYN8qB/x/tRNpvumGnwJ9M
/7wFv+V0oQ8T5D4zur1ODysYeJ5dC63Z6JS+xBXWUqA2kW944a7SwJGw1L+Ch7XG
5+Z2N2V1Um4nGZ9/qNCoGPeEVIz7H0FG0bDNZzZ4QuxtD2SIqffLGGAWfNaqCnrc
Mjt3o6f5LFuXF1H5dZxIUtWkzzv1e4ZvbvHAR56CD3D7DGBvOEF1bS/mqKNAcoOY
/EYOwnm6OysnTaH+z92kkT5nfFBlJg==
=AlaN
-----END PGP SIGNATURE-----

--Sig_/Dr7XEb5Vh9NKhV2ex.+CD5f--