Commit 7dcf2a9f authored by Adrian Bunk's avatar Adrian Bunk Committed by David Woodhouse

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: default avatarAdrian Bunk <bunk@kernel.org>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 44463f7d
#ifndef __LINUX_KVM_ALPHA_H
#define __LINUX_KVM_ALPHA_H
/* alpha does not support KVM */
#endif
#ifndef __LINUX_KVM_ARM_H
#define __LINUX_KVM_ARM_H
/* arm does not support KVM */
#endif
#ifndef __LINUX_KVM_AVR32_H
#define __LINUX_KVM_AVR32_H
/* avr32 does not support KVM */
#endif
#ifndef __LINUX_KVM_BLACKFIN_H
#define __LINUX_KVM_BLACKFIN_H
/* blackfin does not support KVM */
#endif
#ifndef __LINUX_KVM_CRIS_H
#define __LINUX_KVM_CRIS_H
/* cris does not support KVM */
#endif
#ifndef __LINUX_KVM_FRV_H
#define __LINUX_KVM_FRV_H
/* frv does not support KVM */
#endif
ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/kvm.h),)
header-y += kvm.h header-y += kvm.h
endif
ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/a.out.h),) ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/a.out.h),)
unifdef-y += a.out.h unifdef-y += a.out.h
......
#ifndef __LINUX_KVM_H8300_H
#define __LINUX_KVM_H8300_H
/* h8300 does not support KVM */
#endif
#ifndef __LINUX_KVM_M32R_H
#define __LINUX_KVM_M32R_H
/* m32r does not support KVM */
#endif
#ifndef __LINUX_KVM_M68K_H
#define __LINUX_KVM_M68K_H
/* m68k does not support KVM */
#endif
#ifndef __LINUX_KVM_M68KNOMMU_H
#define __LINUX_KVM_M68KNOMMU_H
/* m68knommu does not support KVM */
#endif
#ifndef __LINUX_KVM_MIPS_H
#define __LINUX_KVM_MIPS_H
/* mips does not support KVM */
#endif
#ifndef __LINUX_KVM_MN10300_H
#define __LINUX_KVM_MN10300_H
/* mn10300 does not support KVM */
#endif
#ifndef __LINUX_KVM_PARISC_H
#define __LINUX_KVM_PARISC_H
/* parisc does not support KVM */
#endif
...@@ -7,7 +7,6 @@ header-y += tape390.h ...@@ -7,7 +7,6 @@ header-y += tape390.h
header-y += ucontext.h header-y += ucontext.h
header-y += vtoc.h header-y += vtoc.h
header-y += zcrypt.h header-y += zcrypt.h
header-y += kvm.h
header-y += chsc.h header-y += chsc.h
unifdef-y += cmb.h unifdef-y += cmb.h
......
#ifndef __LINUX_KVM_SH_H
#define __LINUX_KVM_SH_H
/* sh does not support KVM */
#endif
#ifndef __LINUX_KVM_SPARC_H
#define __LINUX_KVM_SPARC_H
/* sparc does not support KVM */
#endif
#include <asm-sparc/kvm.h>
#ifndef __LINUX_KVM_UM_H
#define __LINUX_KVM_UM_H
/* um does not support KVM */
#endif
...@@ -3,7 +3,6 @@ include include/asm-generic/Kbuild.asm ...@@ -3,7 +3,6 @@ include include/asm-generic/Kbuild.asm
header-y += boot.h header-y += boot.h
header-y += bootparam.h header-y += bootparam.h
header-y += debugreg.h header-y += debugreg.h
header-y += kvm.h
header-y += ldt.h header-y += ldt.h
header-y += msr-index.h header-y += msr-index.h
header-y += prctl.h header-y += prctl.h
......
#ifndef __LINUX_KVM_XTENSA_H
#define __LINUX_KVM_XTENSA_H
/* xtensa does not support KVM */
#endif
...@@ -256,7 +256,9 @@ unifdef-y += kd.h ...@@ -256,7 +256,9 @@ unifdef-y += kd.h
unifdef-y += kernelcapi.h unifdef-y += kernelcapi.h
unifdef-y += kernel.h unifdef-y += kernel.h
unifdef-y += keyboard.h unifdef-y += keyboard.h
ifneq ($(wildcard $(srctree)/include/asm-$(SRCARCH)/kvm.h),)
unifdef-y += kvm.h unifdef-y += kvm.h
endif
unifdef-y += llc.h unifdef-y += llc.h
unifdef-y += loop.h unifdef-y += loop.h
unifdef-y += lp.h unifdef-y += lp.h
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment