Re: tools: Consolidate types.h

Oleg Nesterov
2015-05-06T17:31:12Z

On 05/06, Borislav Petkov wrote:
>
> On Wed, May 06, 2015 at 06:54:00PM +0200, Oleg Nesterov wrote:
> > Hi,
> >
> > I can't build the kernel after "git pull",
>
> You mean, you can't build perf tool...?

No, make bzImage fails, it can't compile arch/x86/vdso/vdso2c

>
> >
> > In file included from /usr/include/asm/types.h:4,
> > from ./tools/include/linux/types.h:9,
> > from ./include/uapi/linux/elf.h:4,
> > from arch/x86/vdso/vdso2c.c:66:
> > ./include/uapi/asm-generic/int-ll64.h:11:29: error: asm/bitsperlong.h: No such file or directory
> >
> > I am not 100% sure but it seems that this was broken by
> > d944c4eebcf4c0d5e5d9728fec110cbf0047ad7f "tools: Consolidate types.h"
> >
> > Don't we need the patch below? Or should I finally update my (very old)
> > distro which doesn't have /usr/include/asm/bitsperlong.h ?
> >
> > Oleg.
> >
> >
> > diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
> > index 275a3a8..e970320 100644
> > --- a/arch/x86/vdso/Makefile
> > +++ b/arch/x86/vdso/Makefile
> > @@ -51,7 +51,7 @@ VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \
> > $(obj)/vdso64.so.dbg: $(src)/vdso.lds $(vobjs) FORCE
> > $(call if_changed,vdso)
> >
> > -HOST_EXTRACFLAGS += -I$(srctree)/tools/include -I$(srctree)/include/uapi
> > +HOST_EXTRACFLAGS += -I$(srctree)/tools/include -I$(srctree)/include/uapi -I$(srctree)/arch/x86/include/uapi
>
> Do you have kernel-headers installed on your distro?

I have no idea ;) but I guess they were installed. many years ago.

> That's
> basically those uapi headers packaged separately. There's also "make
> headers_install" which should probably do that (haven't tried it
> though).

Perhaps. but still, if HOST_EXTRACFLAGS has -I$(srctree)/include/uapi, why
it doesn't add arch/x86/include/uapi? This doesn't look consistent in any
case.

Oleg.