From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 17 Aug 2011 14:46:41 +0000 (+0200)
Subject: kvm-kmod: update to 3.0b.
X-Git-Tag: v2.9-core53~47^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ea452c11ebe45e586031835591175926889322dd;p=ipfire-2.x.git

kvm-kmod: update to 3.0b.
---

diff --git a/lfs/kvm-kmod b/lfs/kvm-kmod
index b6418acb17..7cb846eb78 100644
--- a/lfs/kvm-kmod
+++ b/lfs/kvm-kmod
@@ -34,7 +34,7 @@ else
 endif
 endif
 
-VER        = 2.6.38.6
+VER        = 3.0b
 
 THISAPP    = kvm-kmod-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b631ba6ba7b0d3c07de870c6104ffbd5
+$(DL_FILE)_MD5 = 19792041adc25779b31ea5c5fdca7d8c
 
 install : $(TARGET)
 
@@ -83,7 +83,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)_remove_pvclock_scale_delta_redifinition.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)_remove_pvclock_scale_delta_redefinition.patch
 	cd $(DIR_APP) && ./configure --kerneldir=/usr/src/linux
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && install -m 644 x86/*.ko \
diff --git a/src/patches/kvm-kmod-3.0b_remove_pvclock_scale_delta_redefinition.patch b/src/patches/kvm-kmod-3.0b_remove_pvclock_scale_delta_redefinition.patch
new file mode 100644
index 0000000000..87effb30a0
--- /dev/null
+++ b/src/patches/kvm-kmod-3.0b_remove_pvclock_scale_delta_redefinition.patch
@@ -0,0 +1,12 @@
+diff -Naur kvm-kmod-3.0b.org/x86/external-module-compat.h kvm-kmod-3.0b/x86/external-module-compat.h
+--- kvm-kmod-3.0b.org/x86/external-module-compat.h	2011-07-23 16:39:10.000000000 +0200
++++ kvm-kmod-3.0b/x86/external-module-compat.h	2011-08-13 21:37:56.046677541 +0200
+@@ -1095,7 +1095,7 @@
+ 
+ #endif /* >= 2.6.36 */
+ 
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) || \
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) && \
+     (LINUX_VERSION_CODE == KERNEL_VERSION(2,6,32) && KERNEL_EXTRAVERSION < 40)
+ static inline u64 pvclock_scale_delta(u64 delta, u32 mul_frac, int shift)
+ {