From: Jason Gunthorpe <jgg@mellanox.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Nikolay Borisov <nborisov@suse.com>
Subject: Re: linux-next: build failure after merge of the hmm tree
Date: Tue, 9 Jul 2019 12:32:54 +0000 [thread overview]
Message-ID: <20190709123250.GF3436@mellanox.com> (raw)
In-Reply-To: <20190709102137.421d1dd1@canb.auug.org.au>
On Tue, Jul 09, 2019 at 10:21:37AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> On Mon, 1 Jul 2019 21:08:53 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > 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=implicit-function-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
> > +++ b/mm/hmm.c
> > @@ -47,7 +47,7 @@ static struct hmm *hmm_get_or_create(struct mm_struct *mm)
> > {
> > struct hmm *hmm;
> >
> > - lockdep_assert_held_exclusive(&mm->mmap_sem);
> > + lockdep_assert_held_write(&mm->mmap_sem);
> >
> > /* 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_ops = {
> > */
> > 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);
> >
> > /* Sanity check */
> > if (!mm || !mirror || !mirror->ops)
>
> I am still getting this conflict (the commit ids may have changed).
> Just a reminder in case you think Linus may need to know.
Ingo already sent the PR to Linus with the function rename, so I will
take care of it.
Thanks,
Jason
next prev parent reply other threads:[~2019-07-09 12:33 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-01 11:08 linux-next: build failure after merge of the hmm tree Stephen Rothwell
2019-07-09 0:21 ` Stephen Rothwell
2019-07-09 12:32 ` Jason Gunthorpe [this message]
2019-07-01 11:33 Stephen Rothwell
2019-07-01 23:10 ` Jason Gunthorpe
2019-07-03 1:28 ` Alex Deucher
2019-09-02 10:50 Stephen Rothwell
2019-09-02 10:51 ` Jason Gunthorpe
2019-09-02 23:45 ` Stephen Rothwell
2019-09-03 5:31 ` Dan Williams
2019-09-03 5:42 ` Stephen Rothwell
2019-09-03 23:11 ` Dan Williams
2019-11-14 5:34 Stephen Rothwell
2019-11-14 12:58 ` Jason Gunthorpe
2020-10-06 9:35 Stephen Rothwell
2020-10-06 16:41 ` Jason Gunthorpe
2020-10-12 4:19 ` Stephen Rothwell
2020-10-15 21:11 ` Stephen Rothwell
2021-08-23 7:50 Stephen Rothwell
2021-08-23 17:33 ` Jason Gunthorpe
2021-09-01 22:01 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190709123250.GF3436@mellanox.com \
--to=jgg@mellanox.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=nborisov@suse.com \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).