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: 54745 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 n9JB53l7026265 for ; Mon, 19 Oct 2009 11:05:03 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755985AbZJSLEm (ORCPT ); Mon, 19 Oct 2009 07:04:42 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755908AbZJSLEk (ORCPT ); Mon, 19 Oct 2009 07:04:40 -0400 Received: from thoth.sbs.de ([192.35.17.2]:16720 "EHLO thoth.sbs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755913AbZJSLEh (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 n9JB4Sk6032518; Mon, 19 Oct 2009 13:04:28 +0200 Received: from [139.25.109.167] (mchn012c.ww002.siemens.net [139.25.109.167] (may be forged)) by mail1.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id n9JB4SUd020784; Mon, 19 Oct 2009 13:04:28 +0200 From: Jan Kiszka Subject: [PATCH 08/12] Cleanup unused CONFIG_KVM_TRACE control To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org Date: Mon, 19 Oct 2009 12:59:24 +0200 Message-ID: <20091019105924.3988.48291.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/Makefile b/Makefile index 8614449..8420d11 100644 --- a/Makefile +++ b/Makefile @@ -19,10 +19,6 @@ rpmrelease = devel LINUX = ./linux-2.6 -ifeq ($(EXT_CONFIG_KVM_TRACE),y) -module_defines += -DEXT_CONFIG_KVM_TRACE=y -endif - all:: prerequisite # include header priority 1) $LINUX 2) $KERNELDIR 3) include-compat $(MAKE) -C $(KERNELDIR) M=`pwd` \ @@ -31,7 +27,7 @@ all:: prerequisite -Iinclude2 -I$(KERNELSOURCEDIR)/include -I$(KERNELSOURCEDIR)/arch/${ARCH_DIR}/include, \ -Iarch/${ARCH_DIR}/include) -I`pwd`/include-compat -I`pwd`/${ARCH_DIR} \ -include include/linux/autoconf.h \ - -include `pwd`/$(ARCH_DIR)/external-module-compat.h $(module_defines)" \ + -include `pwd`/$(ARCH_DIR)/external-module-compat.h" \ "$$@" include $(MAKEFILE_PRE) diff --git a/configure b/configure index 533313e..83b509c 100755 --- a/configure +++ b/configure @@ -7,7 +7,6 @@ ld=ld objcopy=objcopy ar=ar want_module=1 -kvm_trace= cross_prefix= arch=`uname -m` # don't use uname if kerneldir is set @@ -25,7 +24,6 @@ usage() { Options include: --arch=ARCH architecture to compile for ($arch) --cross-prefix=PREFIX prefix for cross compile - --with-kvm-trace Enable kvm_trace --kerneldir=DIR kernel build directory ($kerneldir) --help this helpful text EOF @@ -49,9 +47,6 @@ while [[ "$1" = -* ]]; do --with-patched-kernel) want_module= ;; - --with-kvm-trace) - kvm_trace=y - ;; --arch) arch="$arg" ;; @@ -136,5 +131,4 @@ KVM_VERSION=$(kvm_version) EOF cat < config.kbuild -EXT_CONFIG_KVM_TRACE=$kvm_trace EOF diff --git a/external-module-compat-comm.h b/external-module-compat-comm.h index 2892ace..a8f8a2f 100644 --- a/external-module-compat-comm.h +++ b/external-module-compat-comm.h @@ -18,13 +18,6 @@ #include #include -/* Override CONFIG_KVM_TRACE */ -#ifdef EXT_CONFIG_KVM_TRACE -# define CONFIG_KVM_TRACE 1 -#else -# undef CONFIG_KVM_TRACE -#endif - /* * 2.6.16 does not have GFP_NOWAIT */