From: Jan Kiszka <[email protected]> This was used to carry CONFIG_KVM_TRACE into the build. We no longer have such switches, so drop the infrastructure. We can easily reintroduce it once required.
Signed-off-by: Jan Kiszka <[email protected]> diff --git a/.gitignore b/.gitignore index 2089ca6..5c46f86 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,6 @@ .*.cmd *.ko *.mod.c -config.kbuild config.mak modules.order Module.symvers diff --git a/Makefile b/Makefile index 8420d11..f406e3d 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,4 @@ include config.mak -include config.kbuild ARCH_DIR = $(if $(filter $(ARCH),x86_64 i386),x86,$(ARCH)) ARCH_CONFIG := $(shell echo $(ARCH_DIR) | tr '[:lower:]' '[:upper:]') @@ -72,4 +71,4 @@ clean: $(MAKE) -C $(KERNELDIR) M=`pwd` $@ distclean: clean - rm -f config.kbuild config.mak include/asm include-compat/asm + rm -f config.mak include/asm include-compat/asm diff --git a/configure b/configure index 83b509c..7122d40 100755 --- a/configure +++ b/configure @@ -129,6 +129,3 @@ AR=$cross_prefix$ar DEPMOD_VERSION=$depmod_version KVM_VERSION=$(kvm_version) EOF - -cat <<EOF > config.kbuild -EOF diff --git a/x86/Kbuild b/x86/Kbuild index 3499593..fad05d5 100644 --- a/x86/Kbuild +++ b/x86/Kbuild @@ -1,7 +1,3 @@ -# trick to get the kvm-specific CONFIG_KVM_* definitions, -# because the kernel source tree won't have them -include $(obj)/../config.kbuild - obj-m := kvm.o kvm-intel.o kvm-amd.o kvm-objs := kvm_main.o x86.o mmu.o emulate.o ../anon_inodes.o irq.o i8259.o \ lapic.o ioapic.o preempt.o i8254.o coalesced_mmio.o irq_comm.o \ -- To unsubscribe from this list: send the line "unsubscribe kvm-commits" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
