History

KVM: export <linux/kvm_para.h> and <asm/kvm_para.h> iif KVM is supported

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.1-rc1, 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, parisc, sh, unicore32, xtensa [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 cleaner, but Paolo suggested [B]. So, this commit goes with [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

Masahiro Yamada committed 7 years ago

Commit 3d9683c1 parent 4d6662333 files · +18 −20Browse files

Unified · Split

33 files
  1. arch/alpha/include/asm/Kbuild +1 −0
  2. arch/alpha/include/uapi/asm/kvm_para.h +0 −2
  3. arch/arc/include/asm/Kbuild +1 −0
  4. arch/arc/include/uapi/asm/Kbuild +0 −1
  5. arch/arm/include/uapi/asm/Kbuild +1 −0
  6. arch/arm/include/uapi/asm/kvm_para.h +0 −2
  7. arch/c6x/include/asm/Kbuild +1 −0
  8. arch/c6x/include/uapi/asm/Kbuild +0 −1
  9. arch/h8300/include/asm/Kbuild +1 −0
  10. arch/h8300/include/uapi/asm/Kbuild +0 −1
  11. arch/hexagon/include/asm/Kbuild +1 −0
  12. arch/hexagon/include/uapi/asm/kvm_para.h +0 −2
  13. arch/ia64/include/asm/Kbuild +1 −0
  14. arch/ia64/include/uapi/asm/Kbuild +0 −1
  15. arch/m68k/include/asm/Kbuild +1 −0
  16. arch/m68k/include/uapi/asm/Kbuild +0 −1
  17. arch/microblaze/include/asm/Kbuild +1 −0
  18. arch/microblaze/include/uapi/asm/Kbuild +0 −1
  19. arch/nios2/include/asm/Kbuild +1 −0
  20. arch/nios2/include/uapi/asm/Kbuild +0 −1
  21. arch/openrisc/include/asm/Kbuild +1 −0
  22. arch/openrisc/include/uapi/asm/Kbuild +0 −1
  23. arch/parisc/include/asm/Kbuild +1 −0
  24. arch/parisc/include/uapi/asm/Kbuild +0 −1
  25. arch/sh/include/asm/Kbuild +1 −0
  26. arch/sh/include/uapi/asm/Kbuild +0 −1
  27. arch/sparc/include/asm/Kbuild +1 −0
  28. arch/sparc/include/uapi/asm/kvm_para.h +0 −2
  29. arch/unicore32/include/asm/Kbuild +1 −0
  30. arch/unicore32/include/uapi/asm/Kbuild +0 −1
  31. arch/xtensa/include/asm/Kbuild +1 −0
  32. arch/xtensa/include/uapi/asm/Kbuild +0 −1
  33. include/uapi/linux/Kbuild +2 −0
arch/alpha/include/asm/Kbuild+1−0
@@ -6,6 +6,7 @@ generic-y += exec.h · 5 unmodified lines
66 generic-y += export.h
77 generic-y += fb.h
88 generic-y += irq_work.h
9+generic-y += kvm_para.h
910 generic-y += mcs_spinlock.h
1011 generic-y += mm-arch-hooks.h
1112 generic-y += preempt.h
arch/alpha/include/uapi/asm/kvm_para.h+0−2
@@ -1,2 +0,0 @@
1−/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2−#include <asm-generic/kvm_para.h>
arch/arc/include/asm/Kbuild+1−0
@@ -11,6 +11,7 @@ generic-y += hardirq.h · 10 unmodified lines
1111 generic-y += hw_irq.h
1212 generic-y += irq_regs.h
1313 generic-y += irq_work.h
14+generic-y += kvm_para.h
1415 generic-y += local.h
1516 generic-y += local64.h
1617 generic-y += mcs_spinlock.h
arch/arc/include/uapi/asm/Kbuild+0−1
@@ -1,2 +1 @@
1−generic-y += kvm_para.h
21 generic-y += ucontext.h
arch/arm/include/uapi/asm/Kbuild+1−0
@@ -3,3 +3,4 @@ · 2 unmodified lines
33 generated-y += unistd-common.h
44 generated-y += unistd-oabi.h
55 generated-y += unistd-eabi.h
6+generic-y += kvm_para.h
arch/arm/include/uapi/asm/kvm_para.h+0−2
@@ -1,2 +0,0 @@
1−/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2−#include <asm-generic/kvm_para.h>
arch/c6x/include/asm/Kbuild+1−0
@@ -19,6 +19,7 @@ generic-y += irq_work.h · 18 unmodified lines
1919 generic-y += kdebug.h
2020 generic-y += kmap_types.h
2121 generic-y += kprobes.h
22+generic-y += kvm_para.h
2223 generic-y += local.h
2324 generic-y += mcs_spinlock.h
2425 generic-y += mm-arch-hooks.h
arch/c6x/include/uapi/asm/Kbuild+0−1
@@ -1,2 +1 @@
1−generic-y += kvm_para.h
21 generic-y += ucontext.h
arch/h8300/include/asm/Kbuild+1−0
@@ -23,6 +23,7 @@ generic-y += irq_work.h · 22 unmodified lines
2323 generic-y += kdebug.h
2424 generic-y += kmap_types.h
2525 generic-y += kprobes.h
26+generic-y += kvm_para.h
2627 generic-y += linkage.h
2728 generic-y += local.h
2829 generic-y += local64.h
arch/h8300/include/uapi/asm/Kbuild+0−1
@@ -1,2 +1 @@
1−generic-y += kvm_para.h
21 generic-y += ucontext.h
arch/hexagon/include/asm/Kbuild+1−0
@@ -19,6 +19,7 @@ generic-y += irq_work.h · 18 unmodified lines
1919 generic-y += kdebug.h
2020 generic-y += kmap_types.h
2121 generic-y += kprobes.h
22+generic-y += kvm_para.h
2223 generic-y += local.h
2324 generic-y += local64.h
2425 generic-y += mcs_spinlock.h
arch/hexagon/include/uapi/asm/kvm_para.h+0−2
@@ -1,2 +0,0 @@
1−/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2−#include <asm-generic/kvm_para.h>
arch/ia64/include/asm/Kbuild+1−0
@@ -2,6 +2,7 @@ generated-y += syscall_table.h · 1 unmodified line
22 generic-y += compat.h
33 generic-y += exec.h
44 generic-y += irq_work.h
5+generic-y += kvm_para.h
56 generic-y += mcs_spinlock.h
67 generic-y += mm-arch-hooks.h
78 generic-y += preempt.h
arch/ia64/include/uapi/asm/Kbuild+0−1
@@ -1,2 +1 @@
11 generated-y += unistd_64.h
2−generic-y += kvm_para.h
arch/m68k/include/asm/Kbuild+1−0
@@ -13,6 +13,7 @@ generic-y += irq_work.h · 12 unmodified lines
1313 generic-y += kdebug.h
1414 generic-y += kmap_types.h
1515 generic-y += kprobes.h
16+generic-y += kvm_para.h
1617 generic-y += local.h
1718 generic-y += local64.h
1819 generic-y += mcs_spinlock.h
arch/m68k/include/uapi/asm/Kbuild+0−1
@@ -1,2 +1 @@
11 generated-y += unistd_32.h
2−generic-y += kvm_para.h
arch/microblaze/include/asm/Kbuild+1−0
@@ -17,6 +17,7 @@ generic-y += irq_work.h · 16 unmodified lines
1717 generic-y += kdebug.h
1818 generic-y += kmap_types.h
1919 generic-y += kprobes.h
20+generic-y += kvm_para.h
2021 generic-y += linkage.h
2122 generic-y += local.h
2223 generic-y += local64.h
arch/microblaze/include/uapi/asm/Kbuild+0−1
@@ -1,3 +1,2 @@
11 generated-y += unistd_32.h
2−generic-y += kvm_para.h
32 generic-y += ucontext.h
arch/nios2/include/asm/Kbuild+1−0
@@ -23,6 +23,7 @@ generic-y += irq_work.h · 22 unmodified lines
2323 generic-y += kdebug.h
2424 generic-y += kmap_types.h
2525 generic-y += kprobes.h
26+generic-y += kvm_para.h
2627 generic-y += local.h
2728 generic-y += mcs_spinlock.h
2829 generic-y += mm-arch-hooks.h
arch/nios2/include/uapi/asm/Kbuild+0−1
@@ -1,2 +1 @@
1−generic-y += kvm_para.h
21 generic-y += ucontext.h
arch/openrisc/include/asm/Kbuild+1−0
@@ -20,6 +20,7 @@ generic-y += irq_work.h · 19 unmodified lines
2020 generic-y += kdebug.h
2121 generic-y += kmap_types.h
2222 generic-y += kprobes.h
23+generic-y += kvm_para.h
2324 generic-y += local.h
2425 generic-y += mcs_spinlock.h
2526 generic-y += mm-arch-hooks.h
arch/openrisc/include/uapi/asm/Kbuild+0−1
@@ -1,2 +1 @@
1−generic-y += kvm_para.h
21 generic-y += ucontext.h
arch/parisc/include/asm/Kbuild+1−0
@@ -11,6 +11,7 @@ generic-y += irq_regs.h · 10 unmodified lines
1111 generic-y += irq_work.h
1212 generic-y += kdebug.h
1313 generic-y += kprobes.h
14+generic-y += kvm_para.h
1415 generic-y += local.h
1516 generic-y += local64.h
1617 generic-y += mcs_spinlock.h
arch/parisc/include/uapi/asm/Kbuild+0−1
@@ -1,3 +1,2 @@
11 generated-y += unistd_32.h
22 generated-y += unistd_64.h
3−generic-y += kvm_para.h
arch/sh/include/asm/Kbuild+1−0
@@ -9,6 +9,7 @@ generic-y += emergency-restart.h · 8 unmodified lines
99 generic-y += exec.h
1010 generic-y += irq_regs.h
1111 generic-y += irq_work.h
12+generic-y += kvm_para.h
1213 generic-y += local.h
1314 generic-y += local64.h
1415 generic-y += mcs_spinlock.h
arch/sh/include/uapi/asm/Kbuild+0−1
@@ -1,5 +1,4 @@
11 # SPDX-License-Identifier: GPL-2.0
22
33 generated-y += unistd_32.h
4−generic-y += kvm_para.h
54 generic-y += ucontext.h
arch/sparc/include/asm/Kbuild+1−0
@@ -9,6 +9,7 @@ generic-y += exec.h · 8 unmodified lines
99 generic-y += export.h
1010 generic-y += irq_regs.h
1111 generic-y += irq_work.h
12+generic-y += kvm_para.h
1213 generic-y += linkage.h
1314 generic-y += local.h
1415 generic-y += local64.h
arch/sparc/include/uapi/asm/kvm_para.h+0−2
@@ -1,2 +0,0 @@
1−/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2−#include <asm-generic/kvm_para.h>
arch/unicore32/include/asm/Kbuild+1−0
@@ -18,6 +18,7 @@ generic-y += irq_work.h · 17 unmodified lines
1818 generic-y += kdebug.h
1919 generic-y += kmap_types.h
2020 generic-y += kprobes.h
21+generic-y += kvm_para.h
2122 generic-y += local.h
2223 generic-y += mcs_spinlock.h
2324 generic-y += mm-arch-hooks.h
arch/unicore32/include/uapi/asm/Kbuild+0−1
@@ -1,2 +1 @@
1−generic-y += kvm_para.h
21 generic-y += ucontext.h
arch/xtensa/include/asm/Kbuild+1−0
@@ -15,6 +15,7 @@ generic-y += irq_work.h · 14 unmodified lines
1515 generic-y += kdebug.h
1616 generic-y += kmap_types.h
1717 generic-y += kprobes.h
18+generic-y += kvm_para.h
1819 generic-y += local.h
1920 generic-y += local64.h
2021 generic-y += mcs_spinlock.h
arch/xtensa/include/uapi/asm/Kbuild+0−1
@@ -1,2 +1 @@
11 generated-y += unistd_32.h
2−generic-y += kvm_para.h
include/uapi/linux/Kbuild+2−0
@@ -7,5 +7,7 @@ no-export-headers += kvm.h · 6 unmodified lines
77 endif
88
99 ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/uapi/asm/kvm_para.h),)
10+ifeq ($(wildcard $(objtree)/arch/$(SRCARCH)/include/generated/uapi/asm/kvm_para.h),)
1011 no-export-headers += kvm_para.h
1112 endif
13+endif