linux-kernel - Re: [PATCH] kbuild: kvm: make export of linux/kvm

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20120802122550.GD9838@mudshark.cambridge.arm.com>
Date:	Thu, 2 Aug 2012 13:25:50 +0100
From:	Will Deacon <will.deacon@....com>
To:	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Cc:	"geert@...ux-m68k.org" <geert@...ux-m68k.org>,
	"akpm@...ux-foundation.org" <akpm@...ux-foundation.org>,
	Arnd Bergmann <arnd@...db.de>, Avi Kivity <avi@...hat.com>
Subject: Re: [PATCH] kbuild: kvm: make export of linux/kvm_para.h
 unconditional

On Thu, Jul 26, 2012 at 02:44:14PM +0100, Will Deacon wrote:
> The asm-generic version of kvm_para.h is always exported, confusing the
> Kbuild wildcarding that tries to detect whether the source architecture
> is exporting the header, since asm-* matches the generic version.
> 
> This patch unconditionally exports linux/kvm_para.h and fixes the few
> remaining architectures without asm/kvm_para.h to use the generic
> version. I also took the liberty of removing some dead lines from the
> wildcarding which was searcing for asm-$(SRCARCH) directores under
> $(srctree).
> 
> Cc: Arnd Bergmann <arnd@...db.de>
> Cc: Avi Kivity <avi@...hat.com>
> Tested-by: Geert Uytterhoeven <geert@...ux-m68k.org>
> Signed-off-by: Will Deacon <will.deacon@....com>
> ---

Any further comments on this? It fixes header generation for me, so it would
be nice to see it merged.

Cheers,

Will

>  arch/cris/include/asm/Kbuild   |    2 ++
>  arch/m32r/include/asm/Kbuild   |    2 ++
>  include/asm-generic/Kbuild.asm |   12 +++---------
>  include/linux/Kbuild           |    8 +-------
>  4 files changed, 8 insertions(+), 16 deletions(-)
> 
> 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
> -- 
> 1.7.4.1
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/