Re: [PATCH] Revert "KVM: Export asm-generic/kvm_para.h"

[Geert Uytterhoeven]

Hi Will,

On Thu, Jul 19, 2012 at 11:37 AM, Will Deacon <will.deacon@xxxxxxx> wrote:
> On Wed, Jul 18, 2012 at 01:33:01PM +0100, Geert Uytterhoeven wrote:
>> > On Wednesday 18 July 2012, Will Deacon wrote:
>> >
>> >> I'm not sure what specific problem the original commit was fixing, so we
>> >> may need to solve this another way if there's something I've missed.
>>
>> See below.
>
> [...]
>
>> make[4]: *** No rule to make target
>> `/scratch/kisskb/build/linux-next_m68k-allmodconfig_m68k/usr/include/linux/kvm_para.h',
>> needed by `/scratch/kisskb/build/linux-next_m68k-allmodconfig_m68k/usr/include/linux/.check'.
>> make[3]: *** [linux] Error 2
>> make[2]: *** [headers_check] Error 2
>
> [...]
>
>> So far the former case is limited to sh (mainline) and m68k (next), but I expect
>> more architectures to start using the "generic-y += ..." idiom.
>>
>> The latter is limited to cris and m32r.
>>
>> Hence just reverting 56457f38f212344fb38b250cfa7e7311c065022f is not the
>> right fix, as it will cause more breakage.
>
> Thanks for the explanation. Given that we have the asm-generic version of
> kvm_para.h, I don't see why we can't just export linux/kvm_para.h
> unconditionally and fix the few remaining architectures by adding generic-y
> lines to their Kbuild files.
>
> Something like below (I also removed what look like dead references to
> asm-$(SRCARCH) in the srctree)...

I applied your patch on next-20120719 and ran "make ARCH=xxx headers_check"
for all architectures (this doesn't require any cross-compilers to be
installed).

It fixes the issue for m32r, m68k, and sh. Cris still fails for another reason.
It did not introduce any regressions for other architectures, so

Tested-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>

> ---8<---
>
> diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild
> index 04d02a5..2fde49c 100644
> --- a/arch/cris/include/asm/Kbuild
> +++ b/arch/cris/include/asm/Kbuild
> @@ -7,3 +7,5 @@ header-y += ethernet.h
>  header-y += etraxgpio.h
>  header-y += rs485.h
>  header-y += sync_serial.h
> +
> +generic-y += kvm_para.h
> diff --git a/arch/m32r/include/asm/Kbuild b/arch/m32r/include/asm/Kbuild
> index c68e168..78c505e 100644
> --- a/arch/m32r/include/asm/Kbuild
> +++ b/arch/m32r/include/asm/Kbuild
> @@ -1 +1,3 @@
>  include include/asm-generic/Kbuild.asm
> +
> +generic-y += kvm_para.h
> diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm
> index c5d2e5d..f180c99 100644
> --- a/include/asm-generic/Kbuild.asm
> +++ b/include/asm-generic/Kbuild.asm
> @@ -1,15 +1,8 @@
> -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h \
> -                 $(srctree)/include/asm-$(SRCARCH)/kvm.h),)
> +ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h),)
>  header-y  += kvm.h
>  endif
>
> -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h \
> -                 $(srctree)/include/asm-$(SRCARCH)/kvm_para.h),)
> -header-y  += kvm_para.h
> -endif
> -
> -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \
> -                 $(srctree)/include/asm-$(SRCARCH)/a.out.h),)
> +ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h),)
>  header-y += a.out.h
>  endif
>
> @@ -21,6 +14,7 @@ header-y += fcntl.h
>  header-y += ioctl.h
>  header-y += ioctls.h
>  header-y += ipcbuf.h
> +header-y += kvm_para.h
>  header-y += mman.h
>  header-y += msgbuf.h
>  header-y += param.h
> diff --git a/include/linux/Kbuild b/include/linux/Kbuild
> index 8760be3..048abc6 100644
> --- a/include/linux/Kbuild
> +++ b/include/linux/Kbuild
> @@ -23,20 +23,13 @@ header-y += wimax/
>  objhdr-y += version.h
>
>  ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \
> -                 $(srctree)/include/asm-$(SRCARCH)/a.out.h \
>                   $(INSTALL_HDR_PATH)/include/asm-*/a.out.h),)
>  header-y += a.out.h
>  endif
>  ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h \
> -                 $(srctree)/include/asm-$(SRCARCH)/kvm.h \
>                   $(INSTALL_HDR_PATH)/include/asm-*/kvm.h),)
>  header-y += kvm.h
>  endif
> -ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h \
> -                 $(srctree)/include/asm-$(SRCARCH)/kvm_para.h \
> -                 $(INSTALL_HDR_PATH)/include/asm-*/kvm_para.h),)
> -header-y += kvm_para.h
> -endif
>
>  header-y += acct.h
>  header-y += adb.h
> @@ -229,6 +222,7 @@ header-y += kernel-page-flags.h
>  header-y += kexec.h
>  header-y += keyboard.h
>  header-y += keyctl.h
> +header-y += kvm_para.h
>  header-y += l2tp.h
>  header-y += limits.h
>  header-y += llc.h

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/