webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-13 20:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

kvm-kmod: update to 3.6.

Browse Source
This commit is contained in:
Arne Fitzenreiter
2012-10-20 13:07:45 +02:00
parent 0f18c3088f
commit ef82c2682f
4 changed files with 4 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lfs/kvm-kmod
View File

@@ -26,7 +26,7 @@ include Config
VERSUFIX=ipfire$(KCFG)
VER = 3.0b
VER = 3.6
THISAPP = kvm-kmod-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 19792041adc25779b31ea5c5fdca7d8c
$(DL_FILE)_MD5 = 3e51d395d6a0ecac6ae600a0515880c2
install : $(TARGET)
@@ -76,7 +76,6 @@ $(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_redefinition.patch
cd $(DIR_APP) && ./configure --kerneldir=/usr/src/linux
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && install -m 644 x86/*.ko \

4
make.sh
View File

@@ -393,7 +393,7 @@ buildipfire() {
# x86-pae (Native and new XEN) kernel build
ipfiremake linux KCFG="-pae"
# ipfiremake kvm-kmod KCFG="-pae"
ipfiremake kvm-kmod KCFG="-pae"
ipfiremake v4l-dvb KCFG="-pae"
ipfiremake alsa KCFG="-pae" KMOD=1
ipfiremake mISDN KCFG="-pae"
@@ -407,7 +407,7 @@ buildipfire() {
# x86 kernel build
ipfiremake linux KCFG=""
# ipfiremake kvm-kmod KCFG=""
ipfiremake kvm-kmod KCFG=""
ipfiremake v4l-dvb KCFG=""
ipfiremake alsa KCFG="" KMOD=1
ipfiremake mISDN KCFG=""

45
src/patches/kvm-kmod-2.6.38.6_remove_pvclock_scale_delta_redifinition.patch
View File

@@ -1,45 +0,0 @@
diff -Naur kvm-kmod-2.6.38.6.org/x86/external-module-compat.h kvm-kmod-2.6.38.6/x86/external-module-compat.h
--- kvm-kmod-2.6.38.6.org/x86/external-module-compat.h 2011-05-15 09:34:48.000000000 +0200
+++ kvm-kmod-2.6.38.6/x86/external-module-compat.h 2011-05-21 13:30:50.529469540 +0200
@@ -1064,41 +1064,6 @@
#endif /* >= 2.6.36 */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
-static inline u64 pvclock_scale_delta(u64 delta, u32 mul_frac, int shift)
-{
- u64 product;
-#ifdef __i386__
- u32 tmp1, tmp2;
-#endif
-
- if (shift < 0)
- delta >>= -shift;
- else
- delta <<= shift;
-
-#ifdef __i386__
- __asm__ (
- "mul %5 ; "
- "mov %4,%%eax ; "
- "mov %%edx,%4 ; "
- "mul %5 ; "
- "xor %5,%5 ; "
- "add %4,%%eax ; "
- "adc %5,%%edx ; "
- : "=A" (product), "=r" (tmp1), "=r" (tmp2)
- : "a" ((u32)delta), "1" ((u32)(delta >> 32)), "2" (mul_frac) );
-#elif defined(__x86_64__)
- __asm__ (
- "mul %%rdx ; shrd $32,%%rdx,%%rax"
- : "=a" (product) : "0" (delta), "d" ((u64)mul_frac) );
-#else
-#error implement me!
-#endif
-
- return product;
-}
-#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34) && \
LINUX_VERSION_CODE != KERNEL_VERSION(2,6,32) && defined(CONFIG_X86_64)

12
src/patches/kvm-kmod-3.0b_remove_pvclock_scale_delta_redefinition.patch
View File

@@ -1,12 +0,0 @@
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)
{