linux-kernel - Re: linux-next: build warning after merge of the mm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Wed, 22 Jun 2022 11:49:30 -0700
From:   Andrew Morton <akpm@...ux-foundation.org>
To:     Mike Kravetz <mike.kravetz@...cle.com>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: build warning after merge of the mm tree

On Wed, 22 Jun 2022 09:39:46 -0700 Mike Kravetz <mike.kravetz@...cle.com> wrote:

> > --- a/mm/hugetlb.c
> > +++ b/mm/hugetlb.c
> > @@ -6905,10 +6905,8 @@ unsigned long hugetlb_mask_last_page(struct hstate *h)
> >  /* See description above.  Architectures can provide their own version. */
> >  __weak unsigned long hugetlb_mask_last_page(struct hstate *h)
> >  {
> > -	unsigned long hp_size = huge_page_size(h);
> > -
> >  #ifdef CONFIG_ARCH_WANT_HUGE_PMD_SHARE
> > -	if (hp_size == PMD_SIZE)
> > +	if (huge_page_size(h) == PMD_SIZE)
> >  		return PUD_SIZE - PMD_SIZE;
> >  #endif
> >  	return 0UL;
> > -- 
> 
> Thanks Stephen,  my bad for not building !CONFIG_ARCH_WANT_HUGE_PMD_SHARE and,
> the error is pretty obvious. :(
> 
> Andrew, do you want me to send an updated version of the patch?  Or,
> would you prefer to include Stephen's fix?

I added Stephen's fix, thanks.