Re: [-mmots 2016-04-25] hugetlb: error: âcpu_has_pseâ undeclared

From: Ingo Molnar
Date: Wed Apr 27 2016 - 04:01:13 EST



* Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> wrote:

> On Tue, 26 Apr 2016 23:14:35 +0900 Sergey Senozhatsky <sergey.senozhatsky@xxxxxxxxx> wrote:
>
> > Hello,
> >
> > v4.6-rc5-mmots-2016-04-25-17-33
> >
> >
> > In file included from include/linux/hugetlb.h:418:0,
> > from fs/hugetlbfs/inode.c:28:
> > fs/hugetlbfs/inode.c: In function 'init_hugetlbfs_fs':
> > ./arch/x86/include/asm/hugetlb.h:7:31: error: 'cpu_has_pse' undeclared (first use in this function)
> > #define hugepages_supported() cpu_has_pse
> > ^
>
> hm, how did that happen. I had some issues with cpu_has_pse a number
> of days ago but they later went away.
>
> In my current tree I have, in arch/x86/include/asm/hugetlb.h:
>
> #define hugepages_supported() boot_cpu_has(X86_FEATURE_PSE)
>
> and that came in from linux-next.patch. I wonder why your tree is
> different.
>
> <looks>
>
> OK, http://ozlabs.org/~akpm/mmots/broken-out/linux-next.patch has no
> changes to arch/x86/include/asm/hugetlb.h at all. Maybe I fat-fingered
> something. Odd.

So I think the reason is that cpu_has_pse is gone from the x86 devel tree, please
use this instead:

boot_cpu_has(X86_FEATURE_PSE)

Thanks,

Ingo