[08/12] Cleanup unused CONFIG_KVM_TRACE control

Commit Message

Jan Kiszka Oct. 19, 2009, 10:59 a.m. UTC

None

Patch

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 <<EOF > 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 <linux/hrtimer.h>
 #include <asm/bitops.h>
 
-/* 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
  */