From patchwork Mon Oct 19 10:59:24 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 54736 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9JB4lKW026129 for ; Mon, 19 Oct 2009 11:04:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756027AbZJSLEk (ORCPT ); Mon, 19 Oct 2009 07:04:40 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756025AbZJSLEi (ORCPT ); Mon, 19 Oct 2009 07:04:38 -0400 Received: from thoth.sbs.de ([192.35.17.2]:16724 "EHLO thoth.sbs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755908AbZJSLEh (ORCPT ); Mon, 19 Oct 2009 07:04:37 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by thoth.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id n9JB4Sut032521; Mon, 19 Oct 2009 13:04:28 +0200 Received: from [139.25.109.167] (mchn012c.mchp.siemens.de [139.25.109.167] (may be forged)) by mail1.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id n9JB4Sbl020785; Mon, 19 Oct 2009 13:04:28 +0200 From: Jan Kiszka Subject: [PATCH 09/12] Drop now unused config.kbuild To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org Date: Mon, 19 Oct 2009 12:59:24 +0200 Message-ID: <20091019105924.3988.22169.stgit@mchn012c.ww002.siemens.net> In-Reply-To: <20091019105923.3988.42243.stgit@mchn012c.ww002.siemens.net> References: <20091019105923.3988.42243.stgit@mchn012c.ww002.siemens.net> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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 < 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 \