Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Mon, 1 Jul 2019 21:08:53 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Jason Gunthorpe <jgg@mellanox.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@elte.hu>, "H. Peter Anvin" <hpa@zytor.com>,
        Peter Zijlstra <peterz@infradead.org>
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Nikolay Borisov <nborisov@suse.com>
Subject: linux-next: build failure after merge of the hmm tree
Message-ID: <20190701210853.0c72240b@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/FKIgdE.+Owqka1kDpKHLUls"; protocol="application/pgp-signature"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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

Hi all,

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

mm/hmm.c: In function 'hmm_get_or_create':
mm/hmm.c:50:2: error: implicit declaration of function 'lockdep_assert_held=
_exclusive'; did you mean 'lockdep_assert_held_once'? [-Werror=3Dimplicit-f=
unction-declaration]
  lockdep_assert_held_exclusive(&mm->mmap_sem);
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  lockdep_assert_held_once

Caused by commit

  8a9320b7ec5d ("mm/hmm: Simplify hmm_get_or_create and make it reliable")

interacting with commit

  9ffbe8ac05db ("locking/lockdep: Rename lockdep_assert_held_exclusive() ->=
 lockdep_assert_held_write()")

from the tip tree.

I have added the following merge fix.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 1 Jul 2019 21:05:59 +1000
Subject: [PATCH] mm/hmm: fixup for "locking/lockdep: Rename
 lockdep_assert_held_exclusive() -> lockdep_assert_held_write()"

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

diff --git a/mm/hmm.c b/mm/hmm.c
index c1bdcef403ee..2ddbd589b207 100644
--- a/mm/hmm.c
+++ b/mm/hmm.c
@@ -47,7 +47,7 @@ static struct hmm *hmm_get_or_create(struct mm_struct *mm)
 {
 	struct hmm *hmm;
=20
-	lockdep_assert_held_exclusive(&mm->mmap_sem);
+	lockdep_assert_held_write(&mm->mmap_sem);
=20
 	/* Abuse the page_table_lock to also protect mm->hmm. */
 	spin_lock(&mm->page_table_lock);
@@ -248,7 +248,7 @@ static const struct mmu_notifier_ops hmm_mmu_notifier_o=
ps =3D {
  */
 int hmm_mirror_register(struct hmm_mirror *mirror, struct mm_struct *mm)
 {
-	lockdep_assert_held_exclusive(&mm->mmap_sem);
+	lockdep_assert_held_write(&mm->mmap_sem);
=20
 	/* Sanity check */
 	if (!mm || !mirror || !mirror->ops)
--=20
2.20.1

--=20
Cheers,
Stephen Rothwell

--Sig_/FKIgdE.+Owqka1kDpKHLUls
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0Z6cUACgkQAVBC80lX
0Gw/+Af9Env8AG0K0JMrb9vaNnUgMUBVs3sNfcg9nWHC8j6zRtIpiUJNHyp7zUGZ
MAoPXvRkmhWz+L5pZFh2CJYebrWC0THTpMu5my81MQJJaPphA+lS6qYCTBfi+xHD
25gmNOt/IEGzLrJrkLOIEO2aag0hpuUkhueUxApKkQzN4xBnLUuFevaAA5mVTnoc
t8qFYFtkCsZxt/NnWmp1DNllGOSIx5T2HfAu3i3hcM/UJeQUvBhEchpMF+tlI6Nf
UA8tmYNoiUVd8lUDnU2SHlz9ObTCb4Ral7tbo8aSr9wxGRyGu5bnNtCHq0rBcLvq
LEKls0F1F6iDij49wT9TC7Ia2PNBOQ==
=6/YF
-----END PGP SIGNATURE-----

--Sig_/FKIgdE.+Owqka1kDpKHLUls--