| 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
| ||
|
Message-ID: <e7ae9588-d653-002f-3d1c-9863258f8579@redhat.com>
Date: Fri, 15 Mar 2019 18:42:48 +0100
From: Paolo Bonzini <pbonzini@...hat.com>
To: Masahiro Yamada <yamada.masahiro@...ionext.com>,
Radim Kr���m������
<rkrcmar@...hat.com>, kvm@...r.kernel.org
Cc: Christoph Hellwig <hch@....de>, Joerg Roedel <joro@...tes.org>,
Christoffer Dall <christoffer.dall@....com>,
Marc Zyngier <marc.zyngier@....com>,
James Hogan <jhogan@...nel.org>, linux-mips@...r.kernel.org,
Paul Mackerras <paulus@...abs.org>, kvm-ppc@...r.kernel.org,
Christian Borntraeger <borntraeger@...ibm.com>,
Janosch Frank <frankja@...ux.ibm.com>,
David Hildenbrand <david@...hat.com>,
Cornelia Huck <cohuck@...hat.com>,
linux-kernel@...r.kernel.org,
linux-arch <linux-arch@...r.kernel.org>,
Sam Ravnborg <sam@...nborg.org>
Subject: Re: [PATCH] KVM: export <linux/kvm_para.h> and <asm/kvm_para.h> iif
KVM is supported
On 06/02/19 06:53, Masahiro Yamada wrote:
> I do not see any consistency about headers_install of <linux/kvm_para.h>
> and <asm/kvm_para.h>.
>
> According to my analysis of Linux 5.0-rc5, there are 3 groups:
>
> [1] Both <linux/kvm_para.h> and <asm/kvm_para.h> are exported
>
> alpha, arm, hexagon, mips, powerpc, s390, sparc, x86
>
> [2] <asm/kvm_para.h> is exported, but <linux/kvm_para.h> is not
>
> arc, arm64, c6x, h8300, ia64, m68k, microblaze, nios2, openrisc
>
> [3] Neither <linux/kvm_para.h> nor <asm/kvm_para.h> is exported
>
> csky, nds32, riscv
>
> This does not match to the actual KVM support. At least, [2] is
> half-baked.
>
> Nor do arch maintainers look like they care about this. For example,
> commit 0add53713b1c ("microblaze: Add missing kvm_para.h to Kbuild")
> exported <asm/kvm_para.h> to user-space in order to fix an in-kernel
> build error.
>
> We have two ways to make this consistent:
>
> [A] export both <linux/kvm_para.h> and <asm/kvm_para.h> for all
> architectures, irrespective of the KVM support
>
> [B] Match the header export of <linux/kvm_para.h> and <asm/kvm_para.h>
> to the KVM support
>
> My first attempt was [A] because the code looks better, but Paolo
> showed preference in [B].
>
> https://patchwork.kernel.org/patch/10794919/
>
> So, this commit is the implementation of [B].
>
> For most architectures, <asm/kvm_para.h> was moved to the kernel-space.
> I changed include/uapi/linux/Kbuild so that it checks generated
> asm/kvm_para.h as well as check-in ones.
>
> After this commit, there will be two groups:
>
> [1] Both <linux/kvm_para.h> and <asm/kvm_para.h> are exported
>
> arm arm64 mips powerpc s390 x86
>
> [2] Neither <linux/kvm_para.h> nor <asm/kvm_para.h> is exported
>
> alpha arc c6x csky h8300 hexagon ia64 m68k microblaze nds32 nios2
> openrisc parisc riscv sh sparc unicore32 xtensa
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@...ionext.com>
> ---
>
> The alternative solution [A] is available at:
> https://patchwork.kernel.org/patch/10794919/
>
> Comparing the code diff, I personally prefer [A]...
>
>
> arch/alpha/include/asm/Kbuild | 1 +
> arch/alpha/include/uapi/asm/kvm_para.h | 2 --
> arch/arc/include/asm/Kbuild | 1 +
> arch/arc/include/uapi/asm/Kbuild | 1 -
> arch/arm/include/uapi/asm/Kbuild | 1 +
> arch/arm/include/uapi/asm/kvm_para.h | 2 --
> arch/c6x/include/asm/Kbuild | 1 +
> arch/c6x/include/uapi/asm/Kbuild | 1 -
> arch/h8300/include/asm/Kbuild | 1 +
> arch/h8300/include/uapi/asm/Kbuild | 1 -
> arch/hexagon/include/asm/Kbuild | 1 +
> arch/hexagon/include/uapi/asm/kvm_para.h | 2 --
> arch/ia64/include/asm/Kbuild | 1 +
> arch/ia64/include/uapi/asm/Kbuild | 1 -
> arch/m68k/include/asm/Kbuild | 1 +
> arch/m68k/include/uapi/asm/Kbuild | 1 -
> arch/microblaze/include/asm/Kbuild | 1 +
> arch/microblaze/include/uapi/asm/Kbuild | 1 -
> arch/mips/include/uapi/asm/Kbuild | 1 +
> arch/mips/include/uapi/asm/kvm_para.h | 5 -----
> arch/nios2/include/asm/Kbuild | 1 +
> arch/nios2/include/uapi/asm/Kbuild | 1 -
> arch/openrisc/include/asm/Kbuild | 1 +
> arch/openrisc/include/uapi/asm/Kbuild | 1 -
> arch/parisc/include/asm/Kbuild | 1 +
> arch/parisc/include/uapi/asm/Kbuild | 1 -
> arch/s390/include/uapi/asm/Kbuild | 1 +
> arch/s390/include/uapi/asm/kvm_para.h | 8 --------
> arch/sh/include/asm/Kbuild | 1 +
> arch/sh/include/uapi/asm/Kbuild | 1 -
> arch/sparc/include/asm/Kbuild | 1 +
> arch/sparc/include/uapi/asm/kvm_para.h | 2 --
> arch/unicore32/include/asm/Kbuild | 1 +
> arch/unicore32/include/uapi/asm/Kbuild | 1 -
> arch/xtensa/include/asm/Kbuild | 1 +
> arch/xtensa/include/uapi/asm/Kbuild | 1 -
> include/uapi/linux/Kbuild | 2 ++
> 37 files changed, 20 insertions(+), 33 deletions(-)
> delete mode 100644 arch/alpha/include/uapi/asm/kvm_para.h
> delete mode 100644 arch/arm/include/uapi/asm/kvm_para.h
> delete mode 100644 arch/hexagon/include/uapi/asm/kvm_para.h
> delete mode 100644 arch/mips/include/uapi/asm/kvm_para.h
> delete mode 100644 arch/s390/include/uapi/asm/kvm_para.h
> delete mode 100644 arch/sparc/include/uapi/asm/kvm_para.h
>
> diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild
> index dc0ab28..70b7833 100644
> --- a/arch/alpha/include/asm/Kbuild
> +++ b/arch/alpha/include/asm/Kbuild
> @@ -6,6 +6,7 @@ generic-y += exec.h
> generic-y += export.h
> generic-y += fb.h
> generic-y += irq_work.h
> +generic-y += kvm_para.h
> generic-y += mcs_spinlock.h
> generic-y += mm-arch-hooks.h
> generic-y += preempt.h
> diff --git a/arch/alpha/include/uapi/asm/kvm_para.h b/arch/alpha/include/uapi/asm/kvm_para.h
> deleted file mode 100644
> index baacc49..0000000
> --- a/arch/alpha/include/uapi/asm/kvm_para.h
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
> -#include <asm-generic/kvm_para.h>
> diff --git a/arch/arc/include/asm/Kbuild b/arch/arc/include/asm/Kbuild
> index caa2702..6e165e1 100644
> --- a/arch/arc/include/asm/Kbuild
> +++ b/arch/arc/include/asm/Kbuild
> @@ -10,6 +10,7 @@ generic-y += hardirq.h
> generic-y += hw_irq.h
> generic-y += irq_regs.h
> generic-y += irq_work.h
> +generic-y += kvm_para.h
> generic-y += local.h
> generic-y += local64.h
> generic-y += mcs_spinlock.h
> diff --git a/arch/arc/include/uapi/asm/Kbuild b/arch/arc/include/uapi/asm/Kbuild
> index 0febf1a..c1b06dc 100644
> --- a/arch/arc/include/uapi/asm/Kbuild
> +++ b/arch/arc/include/uapi/asm/Kbuild
> @@ -1,4 +1,3 @@
> include include/uapi/asm-generic/Kbuild.asm
>
> -generic-y += kvm_para.h
> generic-y += ucontext.h
> diff --git a/arch/arm/include/uapi/asm/Kbuild b/arch/arm/include/uapi/asm/Kbuild
> index eee8f7d..482e5ec 100644
> --- a/arch/arm/include/uapi/asm/Kbuild
> +++ b/arch/arm/include/uapi/asm/Kbuild
> @@ -4,3 +4,4 @@ include include/uapi/asm-generic/Kbuild.asm
> generated-y += unistd-common.h
> generated-y += unistd-oabi.h
> generated-y += unistd-eabi.h
> +generic-y += kvm_para.h
> diff --git a/arch/arm/include/uapi/asm/kvm_para.h b/arch/arm/include/uapi/asm/kvm_para.h
> deleted file mode 100644
> index baacc49..0000000
> --- a/arch/arm/include/uapi/asm/kvm_para.h
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
> -#include <asm-generic/kvm_para.h>
> diff --git a/arch/c6x/include/asm/Kbuild b/arch/c6x/include/asm/Kbuild
> index 63b4a17..249c9f6 100644
> --- a/arch/c6x/include/asm/Kbuild
> +++ b/arch/c6x/include/asm/Kbuild
> @@ -19,6 +19,7 @@ generic-y += irq_work.h
> generic-y += kdebug.h
> generic-y += kmap_types.h
> generic-y += kprobes.h
> +generic-y += kvm_para.h
> generic-y += local.h
> generic-y += mcs_spinlock.h
> generic-y += mm-arch-hooks.h
> diff --git a/arch/c6x/include/uapi/asm/Kbuild b/arch/c6x/include/uapi/asm/Kbuild
> index 0febf1a..c1b06dc 100644
> --- a/arch/c6x/include/uapi/asm/Kbuild
> +++ b/arch/c6x/include/uapi/asm/Kbuild
> @@ -1,4 +1,3 @@
> include include/uapi/asm-generic/Kbuild.asm
>
> -generic-y += kvm_para.h
> generic-y += ucontext.h
> diff --git a/arch/h8300/include/asm/Kbuild b/arch/h8300/include/asm/Kbuild
> index 961c1dc..c86e3e7 100644
> --- a/arch/h8300/include/asm/Kbuild
> +++ b/arch/h8300/include/asm/Kbuild
> @@ -24,6 +24,7 @@ generic-y += irq_work.h
> generic-y += kdebug.h
> generic-y += kmap_types.h
> generic-y += kprobes.h
> +generic-y += kvm_para.h
> generic-y += linkage.h
> generic-y += local.h
> generic-y += local64.h
> diff --git a/arch/h8300/include/uapi/asm/Kbuild b/arch/h8300/include/uapi/asm/Kbuild
> index 0febf1a..c1b06dc 100644
> --- a/arch/h8300/include/uapi/asm/Kbuild
> +++ b/arch/h8300/include/uapi/asm/Kbuild
> @@ -1,4 +1,3 @@
> include include/uapi/asm-generic/Kbuild.asm
>
> -generic-y += kvm_para.h
> generic-y += ucontext.h
> diff --git a/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild
> index b25fd42..d046e8c 100644
> --- a/arch/hexagon/include/asm/Kbuild
> +++ b/arch/hexagon/include/asm/Kbuild
> @@ -19,6 +19,7 @@ generic-y += irq_work.h
> generic-y += kdebug.h
> generic-y += kmap_types.h
> generic-y += kprobes.h
> +generic-y += kvm_para.h
> generic-y += local.h
> generic-y += local64.h
> generic-y += mcs_spinlock.h
> diff --git a/arch/hexagon/include/uapi/asm/kvm_para.h b/arch/hexagon/include/uapi/asm/kvm_para.h
> deleted file mode 100644
> index baacc49..0000000
> --- a/arch/hexagon/include/uapi/asm/kvm_para.h
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
> -#include <asm-generic/kvm_para.h>
> diff --git a/arch/ia64/include/asm/Kbuild b/arch/ia64/include/asm/Kbuild
> index 43e21fe..11f1916 100644
> --- a/arch/ia64/include/asm/Kbuild
> +++ b/arch/ia64/include/asm/Kbuild
> @@ -2,6 +2,7 @@ generated-y += syscall_table.h
> generic-y += compat.h
> generic-y += exec.h
> generic-y += irq_work.h
> +generic-y += kvm_para.h
> generic-y += mcs_spinlock.h
> generic-y += mm-arch-hooks.h
> generic-y += preempt.h
> diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild
> index 5b819e5..1d5c4aa 100644
> --- a/arch/ia64/include/uapi/asm/Kbuild
> +++ b/arch/ia64/include/uapi/asm/Kbuild
> @@ -1,4 +1,3 @@
> include include/uapi/asm-generic/Kbuild.asm
>
> generated-y += unistd_64.h
> -generic-y += kvm_para.h
> diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild
> index 95f8f63..2c359d9 100644
> --- a/arch/m68k/include/asm/Kbuild
> +++ b/arch/m68k/include/asm/Kbuild
> @@ -13,6 +13,7 @@ generic-y += irq_work.h
> generic-y += kdebug.h
> generic-y += kmap_types.h
> generic-y += kprobes.h
> +generic-y += kvm_para.h
> generic-y += local.h
> generic-y += local64.h
> generic-y += mcs_spinlock.h
> diff --git a/arch/m68k/include/uapi/asm/Kbuild b/arch/m68k/include/uapi/asm/Kbuild
> index 960bf1e..439f515 100644
> --- a/arch/m68k/include/uapi/asm/Kbuild
> +++ b/arch/m68k/include/uapi/asm/Kbuild
> @@ -1,4 +1,3 @@
> include include/uapi/asm-generic/Kbuild.asm
>
> generated-y += unistd_32.h
> -generic-y += kvm_para.h
> diff --git a/arch/microblaze/include/asm/Kbuild b/arch/microblaze/include/asm/Kbuild
> index 791cc8d5..1a8285c 100644
> --- a/arch/microblaze/include/asm/Kbuild
> +++ b/arch/microblaze/include/asm/Kbuild
> @@ -17,6 +17,7 @@ generic-y += irq_work.h
> generic-y += kdebug.h
> generic-y += kmap_types.h
> generic-y += kprobes.h
> +generic-y += kvm_para.h
> generic-y += linkage.h
> generic-y += local.h
> generic-y += local64.h
> diff --git a/arch/microblaze/include/uapi/asm/Kbuild b/arch/microblaze/include/uapi/asm/Kbuild
> index 97823ec..3f03cf6 100644
> --- a/arch/microblaze/include/uapi/asm/Kbuild
> +++ b/arch/microblaze/include/uapi/asm/Kbuild
> @@ -1,5 +1,4 @@
> include include/uapi/asm-generic/Kbuild.asm
>
> generated-y += unistd_32.h
> -generic-y += kvm_para.h
> generic-y += ucontext.h
> diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild
> index 0851c10..57dd982 100644
> --- a/arch/mips/include/uapi/asm/Kbuild
> +++ b/arch/mips/include/uapi/asm/Kbuild
> @@ -6,3 +6,4 @@ generated-y += unistd_o32.h
> generated-y += unistd_nr_n32.h
> generated-y += unistd_nr_n64.h
> generated-y += unistd_nr_o32.h
> +generic-y += kvm_para.h
> diff --git a/arch/mips/include/uapi/asm/kvm_para.h b/arch/mips/include/uapi/asm/kvm_para.h
> deleted file mode 100644
> index 7e16d7c..0000000
> --- a/arch/mips/include/uapi/asm/kvm_para.h
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -#ifndef _UAPI_ASM_MIPS_KVM_PARA_H
> -#define _UAPI_ASM_MIPS_KVM_PARA_H
> -
> -
> -#endif /* _UAPI_ASM_MIPS_KVM_PARA_H */
> diff --git a/arch/nios2/include/asm/Kbuild b/arch/nios2/include/asm/Kbuild
> index 8fde4fa..88a667d 100644
> --- a/arch/nios2/include/asm/Kbuild
> +++ b/arch/nios2/include/asm/Kbuild
> @@ -23,6 +23,7 @@ generic-y += irq_work.h
> generic-y += kdebug.h
> generic-y += kmap_types.h
> generic-y += kprobes.h
> +generic-y += kvm_para.h
> generic-y += local.h
> generic-y += mcs_spinlock.h
> generic-y += mm-arch-hooks.h
> diff --git a/arch/nios2/include/uapi/asm/Kbuild b/arch/nios2/include/uapi/asm/Kbuild
> index 0febf1a..c1b06dc 100644
> --- a/arch/nios2/include/uapi/asm/Kbuild
> +++ b/arch/nios2/include/uapi/asm/Kbuild
> @@ -1,4 +1,3 @@
> include include/uapi/asm-generic/Kbuild.asm
>
> -generic-y += kvm_para.h
> generic-y += ucontext.h
> diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild
> index 1f04844b..ad06de9 100644
> --- a/arch/openrisc/include/asm/Kbuild
> +++ b/arch/openrisc/include/asm/Kbuild
> @@ -21,6 +21,7 @@ generic-y += irq_work.h
> generic-y += kdebug.h
> generic-y += kmap_types.h
> generic-y += kprobes.h
> +generic-y += kvm_para.h
> generic-y += local.h
> generic-y += mcs_spinlock.h
> generic-y += mm-arch-hooks.h
> diff --git a/arch/openrisc/include/uapi/asm/Kbuild b/arch/openrisc/include/uapi/asm/Kbuild
> index 0febf1a..c1b06dc 100644
> --- a/arch/openrisc/include/uapi/asm/Kbuild
> +++ b/arch/openrisc/include/uapi/asm/Kbuild
> @@ -1,4 +1,3 @@
> include include/uapi/asm-generic/Kbuild.asm
>
> -generic-y += kvm_para.h
> generic-y += ucontext.h
> diff --git a/arch/parisc/include/asm/Kbuild b/arch/parisc/include/asm/Kbuild
> index 0b1e354..3abb960 100644
> --- a/arch/parisc/include/asm/Kbuild
> +++ b/arch/parisc/include/asm/Kbuild
> @@ -12,6 +12,7 @@ generic-y += irq_regs.h
> generic-y += irq_work.h
> generic-y += kdebug.h
> generic-y += kprobes.h
> +generic-y += kvm_para.h
> generic-y += local.h
> generic-y += local64.h
> generic-y += mcs_spinlock.h
> diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild
> index c54353d..214a39a 100644
> --- a/arch/parisc/include/uapi/asm/Kbuild
> +++ b/arch/parisc/include/uapi/asm/Kbuild
> @@ -2,4 +2,3 @@ include include/uapi/asm-generic/Kbuild.asm
>
> generated-y += unistd_32.h
> generated-y += unistd_64.h
> -generic-y += kvm_para.h
> diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild
> index da3e0d4..96ad5d7 100644
> --- a/arch/s390/include/uapi/asm/Kbuild
> +++ b/arch/s390/include/uapi/asm/Kbuild
> @@ -3,3 +3,4 @@ include include/uapi/asm-generic/Kbuild.asm
>
> generated-y += unistd_32.h
> generated-y += unistd_64.h
> +generic-y += kvm_para.h
> diff --git a/arch/s390/include/uapi/asm/kvm_para.h b/arch/s390/include/uapi/asm/kvm_para.h
> deleted file mode 100644
> index b9ab584..0000000
> --- a/arch/s390/include/uapi/asm/kvm_para.h
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
> -/*
> - * User API definitions for paravirtual devices on s390
> - *
> - * Copyright IBM Corp. 2008
> - *
> - * Author(s): Christian Borntraeger <borntraeger@...ibm.com>
> - */
> diff --git a/arch/sh/include/asm/Kbuild b/arch/sh/include/asm/Kbuild
> index a6ef3fe..7bf2cb6 100644
> --- a/arch/sh/include/asm/Kbuild
> +++ b/arch/sh/include/asm/Kbuild
> @@ -9,6 +9,7 @@ generic-y += emergency-restart.h
> generic-y += exec.h
> generic-y += irq_regs.h
> generic-y += irq_work.h
> +generic-y += kvm_para.h
> generic-y += local.h
> generic-y += local64.h
> generic-y += mcs_spinlock.h
> diff --git a/arch/sh/include/uapi/asm/Kbuild b/arch/sh/include/uapi/asm/Kbuild
> index eaa30bc..0ec45ff 100644
> --- a/arch/sh/include/uapi/asm/Kbuild
> +++ b/arch/sh/include/uapi/asm/Kbuild
> @@ -2,5 +2,4 @@
> include include/uapi/asm-generic/Kbuild.asm
>
> generated-y += unistd_32.h
> -generic-y += kvm_para.h
> generic-y += ucontext.h
> diff --git a/arch/sparc/include/asm/Kbuild b/arch/sparc/include/asm/Kbuild
> index b82f64e..a22cfd5 100644
> --- a/arch/sparc/include/asm/Kbuild
> +++ b/arch/sparc/include/asm/Kbuild
> @@ -9,6 +9,7 @@ generic-y += exec.h
> generic-y += export.h
> generic-y += irq_regs.h
> generic-y += irq_work.h
> +generic-y += kvm_para.h
> generic-y += linkage.h
> generic-y += local.h
> generic-y += local64.h
> diff --git a/arch/sparc/include/uapi/asm/kvm_para.h b/arch/sparc/include/uapi/asm/kvm_para.h
> deleted file mode 100644
> index baacc49..0000000
> --- a/arch/sparc/include/uapi/asm/kvm_para.h
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
> -#include <asm-generic/kvm_para.h>
> diff --git a/arch/unicore32/include/asm/Kbuild b/arch/unicore32/include/asm/Kbuild
> index 1d1544b..d77d953 100644
> --- a/arch/unicore32/include/asm/Kbuild
> +++ b/arch/unicore32/include/asm/Kbuild
> @@ -18,6 +18,7 @@ generic-y += irq_work.h
> generic-y += kdebug.h
> generic-y += kmap_types.h
> generic-y += kprobes.h
> +generic-y += kvm_para.h
> generic-y += local.h
> generic-y += mcs_spinlock.h
> generic-y += mm-arch-hooks.h
> diff --git a/arch/unicore32/include/uapi/asm/Kbuild b/arch/unicore32/include/uapi/asm/Kbuild
> index 0febf1a..c1b06dc 100644
> --- a/arch/unicore32/include/uapi/asm/Kbuild
> +++ b/arch/unicore32/include/uapi/asm/Kbuild
> @@ -1,4 +1,3 @@
> include include/uapi/asm-generic/Kbuild.asm
>
> -generic-y += kvm_para.h
> generic-y += ucontext.h
> diff --git a/arch/xtensa/include/asm/Kbuild b/arch/xtensa/include/asm/Kbuild
> index e255683..d474c34 100644
> --- a/arch/xtensa/include/asm/Kbuild
> +++ b/arch/xtensa/include/asm/Kbuild
> @@ -15,6 +15,7 @@ generic-y += irq_work.h
> generic-y += kdebug.h
> generic-y += kmap_types.h
> generic-y += kprobes.h
> +generic-y += kvm_para.h
> generic-y += linkage.h
> generic-y += local.h
> generic-y += local64.h
> diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild
> index 960bf1e..439f515 100644
> --- a/arch/xtensa/include/uapi/asm/Kbuild
> +++ b/arch/xtensa/include/uapi/asm/Kbuild
> @@ -1,4 +1,3 @@
> include include/uapi/asm-generic/Kbuild.asm
>
> generated-y += unistd_32.h
> -generic-y += kvm_para.h
> diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
> index 5f24b50..059dc2b 100644
> --- a/include/uapi/linux/Kbuild
> +++ b/include/uapi/linux/Kbuild
> @@ -7,5 +7,7 @@ no-export-headers += kvm.h
> endif
>
> ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h),)
> +ifeq ($(wildcard $(objtree)/arch/$(SRCARCH)/include/generated/uapi/asm/kvm_para.h),)
> no-export-headers += kvm_para.h
> endif
> +endif
>
Thanks, queued for 5.2.
Paolo
Powered by blists - more mailing lists