remove dummy asm/kvm.h files

This patch removes the dummy asm/kvm.h files on architectures not (yet) supporting KVM and uses the same conditional headers installation as already used for a.out.h . Also removed are superfluous install rules in the s390 and x86 Kbuild files (they are already in Kbuild.asm). Signed-off-by: Adrian Bunk <bunk@kernel.org> Acked-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
git-mirror · Jul 25, 2008 · 7dcf2a9 · 7dcf2a9
1 parent 44463f7
commit 7dcf2a9
Show file tree

Hide file tree

Showing 22 changed files with 4 additions and 105 deletions.
diff --git a/include/asm-alpha/kvm.h b/include/asm-alpha/kvm.h
diff --git a/include/asm-arm/kvm.h b/include/asm-arm/kvm.h
diff --git a/include/asm-avr32/kvm.h b/include/asm-avr32/kvm.h
diff --git a/include/asm-blackfin/kvm.h b/include/asm-blackfin/kvm.h
diff --git a/include/asm-cris/kvm.h b/include/asm-cris/kvm.h
diff --git a/include/asm-frv/kvm.h b/include/asm-frv/kvm.h
diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm
@@ -1,4 +1,6 @@
+ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/kvm.h),)
 header-y  += kvm.h
+endif
 
 ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/a.out.h),)
 unifdef-y += a.out.h

diff --git a/include/asm-h8300/kvm.h b/include/asm-h8300/kvm.h
diff --git a/include/asm-m32r/kvm.h b/include/asm-m32r/kvm.h
diff --git a/include/asm-m68k/kvm.h b/include/asm-m68k/kvm.h
diff --git a/include/asm-m68knommu/kvm.h b/include/asm-m68knommu/kvm.h
diff --git a/include/asm-mips/kvm.h b/include/asm-mips/kvm.h
diff --git a/include/asm-mn10300/kvm.h b/include/asm-mn10300/kvm.h
diff --git a/include/asm-parisc/kvm.h b/include/asm-parisc/kvm.h
diff --git a/include/asm-s390/Kbuild b/include/asm-s390/Kbuild
@@ -7,7 +7,6 @@ header-y += tape390.h
 header-y += ucontext.h
 header-y += vtoc.h
 header-y += zcrypt.h
-header-y += kvm.h
 header-y += chsc.h
 
 unifdef-y += cmb.h

diff --git a/include/asm-sh/kvm.h b/include/asm-sh/kvm.h
diff --git a/include/asm-sparc/kvm.h b/include/asm-sparc/kvm.h
diff --git a/include/asm-sparc64/kvm.h b/include/asm-sparc64/kvm.h
diff --git a/include/asm-um/kvm.h b/include/asm-um/kvm.h
diff --git a/include/asm-x86/Kbuild b/include/asm-x86/Kbuild
@@ -3,7 +3,6 @@ include include/asm-generic/Kbuild.asm
 header-y += boot.h
 header-y += bootparam.h
 header-y += debugreg.h
-header-y += kvm.h
 header-y += ldt.h
 header-y += msr-index.h
 header-y += prctl.h

diff --git a/include/asm-xtensa/kvm.h b/include/asm-xtensa/kvm.h
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
@@ -256,7 +256,9 @@ unifdef-y += kd.h
 unifdef-y += kernelcapi.h
 unifdef-y += kernel.h
 unifdef-y += keyboard.h
+ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/kvm.h),)
 unifdef-y += kvm.h
+endif
 unifdef-y += llc.h
 unifdef-y += loop.h
 unifdef-y += lp.h