From 382a3e7ce7500ea2fa5f4511bfc12087c1520e57 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Tue, 1 Jul 2008 19:27:16 +0300 Subject: [PATCH] --- yaml --- r: 106121 b: refs/heads/master c: 7dcf2a9fced59e58e4694cdcf15850c01fdba89b h: refs/heads/master i: 106119: 4f4ad12aa3b887f697df6871b59c7fbe553788f5 v: v3 --- [refs] | 2 +- trunk/include/asm-alpha/kvm.h | 6 ------ trunk/include/asm-arm/kvm.h | 6 ------ trunk/include/asm-avr32/kvm.h | 6 ------ trunk/include/asm-blackfin/kvm.h | 6 ------ trunk/include/asm-cris/kvm.h | 6 ------ trunk/include/asm-frv/kvm.h | 6 ------ trunk/include/asm-generic/Kbuild.asm | 2 ++ trunk/include/asm-h8300/kvm.h | 6 ------ trunk/include/asm-m32r/kvm.h | 6 ------ trunk/include/asm-m68k/kvm.h | 6 ------ trunk/include/asm-m68knommu/kvm.h | 6 ------ trunk/include/asm-mips/kvm.h | 6 ------ trunk/include/asm-mn10300/kvm.h | 6 ------ trunk/include/asm-parisc/kvm.h | 6 ------ trunk/include/asm-s390/Kbuild | 1 - trunk/include/asm-sh/kvm.h | 6 ------ trunk/include/asm-sparc/kvm.h | 6 ------ trunk/include/asm-sparc64/kvm.h | 1 - trunk/include/asm-um/kvm.h | 6 ------ trunk/include/asm-x86/Kbuild | 1 - trunk/include/asm-xtensa/kvm.h | 6 ------ trunk/include/linux/Kbuild | 2 ++ 23 files changed, 5 insertions(+), 106 deletions(-) delete mode 100644 trunk/include/asm-alpha/kvm.h delete mode 100644 trunk/include/asm-arm/kvm.h delete mode 100644 trunk/include/asm-avr32/kvm.h delete mode 100644 trunk/include/asm-blackfin/kvm.h delete mode 100644 trunk/include/asm-cris/kvm.h delete mode 100644 trunk/include/asm-frv/kvm.h delete mode 100644 trunk/include/asm-h8300/kvm.h delete mode 100644 trunk/include/asm-m32r/kvm.h delete mode 100644 trunk/include/asm-m68k/kvm.h delete mode 100644 trunk/include/asm-m68knommu/kvm.h delete mode 100644 trunk/include/asm-mips/kvm.h delete mode 100644 trunk/include/asm-mn10300/kvm.h delete mode 100644 trunk/include/asm-parisc/kvm.h delete mode 100644 trunk/include/asm-sh/kvm.h delete mode 100644 trunk/include/asm-sparc/kvm.h delete mode 100644 trunk/include/asm-sparc64/kvm.h delete mode 100644 trunk/include/asm-um/kvm.h delete mode 100644 trunk/include/asm-xtensa/kvm.h diff --git a/[refs] b/[refs] index bd6952c47e28..b037da202d6c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44463f7dd6c8039904333e4374e5c6e9ad83006f +refs/heads/master: 7dcf2a9fced59e58e4694cdcf15850c01fdba89b diff --git a/trunk/include/asm-alpha/kvm.h b/trunk/include/asm-alpha/kvm.h deleted file mode 100644 index b9daec429689..000000000000 --- a/trunk/include/asm-alpha/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_ALPHA_H -#define __LINUX_KVM_ALPHA_H - -/* alpha does not support KVM */ - -#endif diff --git a/trunk/include/asm-arm/kvm.h b/trunk/include/asm-arm/kvm.h deleted file mode 100644 index cb3c08cbcb9e..000000000000 --- a/trunk/include/asm-arm/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_ARM_H -#define __LINUX_KVM_ARM_H - -/* arm does not support KVM */ - -#endif diff --git a/trunk/include/asm-avr32/kvm.h b/trunk/include/asm-avr32/kvm.h deleted file mode 100644 index 8c5777020e2c..000000000000 --- a/trunk/include/asm-avr32/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_AVR32_H -#define __LINUX_KVM_AVR32_H - -/* avr32 does not support KVM */ - -#endif diff --git a/trunk/include/asm-blackfin/kvm.h b/trunk/include/asm-blackfin/kvm.h deleted file mode 100644 index e3477d77c014..000000000000 --- a/trunk/include/asm-blackfin/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_BLACKFIN_H -#define __LINUX_KVM_BLACKFIN_H - -/* blackfin does not support KVM */ - -#endif diff --git a/trunk/include/asm-cris/kvm.h b/trunk/include/asm-cris/kvm.h deleted file mode 100644 index c860f51149f0..000000000000 --- a/trunk/include/asm-cris/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_CRIS_H -#define __LINUX_KVM_CRIS_H - -/* cris does not support KVM */ - -#endif diff --git a/trunk/include/asm-frv/kvm.h b/trunk/include/asm-frv/kvm.h deleted file mode 100644 index 9c8a4f08d0a9..000000000000 --- a/trunk/include/asm-frv/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_FRV_H -#define __LINUX_KVM_FRV_H - -/* frv does not support KVM */ - -#endif diff --git a/trunk/include/asm-generic/Kbuild.asm b/trunk/include/asm-generic/Kbuild.asm index 7cd25b8e7c9a..1170dc60e638 100644 --- a/trunk/include/asm-generic/Kbuild.asm +++ b/trunk/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/trunk/include/asm-h8300/kvm.h b/trunk/include/asm-h8300/kvm.h deleted file mode 100644 index bdbed7b987e1..000000000000 --- a/trunk/include/asm-h8300/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_H8300_H -#define __LINUX_KVM_H8300_H - -/* h8300 does not support KVM */ - -#endif diff --git a/trunk/include/asm-m32r/kvm.h b/trunk/include/asm-m32r/kvm.h deleted file mode 100644 index 99a40515b77e..000000000000 --- a/trunk/include/asm-m32r/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_M32R_H -#define __LINUX_KVM_M32R_H - -/* m32r does not support KVM */ - -#endif diff --git a/trunk/include/asm-m68k/kvm.h b/trunk/include/asm-m68k/kvm.h deleted file mode 100644 index 7ed27fce5240..000000000000 --- a/trunk/include/asm-m68k/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_M68K_H -#define __LINUX_KVM_M68K_H - -/* m68k does not support KVM */ - -#endif diff --git a/trunk/include/asm-m68knommu/kvm.h b/trunk/include/asm-m68knommu/kvm.h deleted file mode 100644 index b49d4258dabb..000000000000 --- a/trunk/include/asm-m68knommu/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_M68KNOMMU_H -#define __LINUX_KVM_M68KNOMMU_H - -/* m68knommu does not support KVM */ - -#endif diff --git a/trunk/include/asm-mips/kvm.h b/trunk/include/asm-mips/kvm.h deleted file mode 100644 index 093a5b7f796b..000000000000 --- a/trunk/include/asm-mips/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_MIPS_H -#define __LINUX_KVM_MIPS_H - -/* mips does not support KVM */ - -#endif diff --git a/trunk/include/asm-mn10300/kvm.h b/trunk/include/asm-mn10300/kvm.h deleted file mode 100644 index f6b609ff4a57..000000000000 --- a/trunk/include/asm-mn10300/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_MN10300_H -#define __LINUX_KVM_MN10300_H - -/* mn10300 does not support KVM */ - -#endif diff --git a/trunk/include/asm-parisc/kvm.h b/trunk/include/asm-parisc/kvm.h deleted file mode 100644 index 00cc45812547..000000000000 --- a/trunk/include/asm-parisc/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_PARISC_H -#define __LINUX_KVM_PARISC_H - -/* parisc does not support KVM */ - -#endif diff --git a/trunk/include/asm-s390/Kbuild b/trunk/include/asm-s390/Kbuild index bb5e9edb9825..63a23415fba6 100644 --- a/trunk/include/asm-s390/Kbuild +++ b/trunk/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/trunk/include/asm-sh/kvm.h b/trunk/include/asm-sh/kvm.h deleted file mode 100644 index 6af51dbab2d0..000000000000 --- a/trunk/include/asm-sh/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_SH_H -#define __LINUX_KVM_SH_H - -/* sh does not support KVM */ - -#endif diff --git a/trunk/include/asm-sparc/kvm.h b/trunk/include/asm-sparc/kvm.h deleted file mode 100644 index 2e5478da3819..000000000000 --- a/trunk/include/asm-sparc/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_SPARC_H -#define __LINUX_KVM_SPARC_H - -/* sparc does not support KVM */ - -#endif diff --git a/trunk/include/asm-sparc64/kvm.h b/trunk/include/asm-sparc64/kvm.h deleted file mode 100644 index 53564ad86b15..000000000000 --- a/trunk/include/asm-sparc64/kvm.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/trunk/include/asm-um/kvm.h b/trunk/include/asm-um/kvm.h deleted file mode 100644 index 66aa77094551..000000000000 --- a/trunk/include/asm-um/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_UM_H -#define __LINUX_KVM_UM_H - -/* um does not support KVM */ - -#endif diff --git a/trunk/include/asm-x86/Kbuild b/trunk/include/asm-x86/Kbuild index 1e3554596f72..811e9828ccb3 100644 --- a/trunk/include/asm-x86/Kbuild +++ b/trunk/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/trunk/include/asm-xtensa/kvm.h b/trunk/include/asm-xtensa/kvm.h deleted file mode 100644 index bda4e331e98c..000000000000 --- a/trunk/include/asm-xtensa/kvm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __LINUX_KVM_XTENSA_H -#define __LINUX_KVM_XTENSA_H - -/* xtensa does not support KVM */ - -#endif diff --git a/trunk/include/linux/Kbuild b/trunk/include/linux/Kbuild index 71d70d1fbce2..402c8f55d713 100644 --- a/trunk/include/linux/Kbuild +++ b/trunk/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