projects / people / teissler / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 62b923f9 AF |
1 | 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 |
| 2 | --- kvm-kmod-2.6.38.6.org/x86/external-module-compat.h 2011-05-15 09:34:48.000000000 +0200 | |
| 3 | +++ kvm-kmod-2.6.38.6/x86/external-module-compat.h 2011-05-21 13:30:50.529469540 +0200 | |
| 4 | @@ -1064,41 +1064,6 @@ | |
| 5 | ||
| 6 | #endif /* >= 2.6.36 */ | |
| 7 | ||
| 8 | -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) | |
| 9 | -static inline u64 pvclock_scale_delta(u64 delta, u32 mul_frac, int shift) | |
| 10 | -{ | |
| 11 | - u64 product; | |
| 12 | -#ifdef __i386__ | |
| 13 | - u32 tmp1, tmp2; | |
| 14 | -#endif | |
| 15 | - | |
| 16 | - if (shift < 0) | |
| 17 | - delta >>= -shift; | |
| 18 | - else | |
| 19 | - delta <<= shift; | |
| 20 | - | |
| 21 | -#ifdef __i386__ | |
| 22 | - __asm__ ( | |
| 23 | - "mul %5 ; " | |
| 24 | - "mov %4,%%eax ; " | |
| 25 | - "mov %%edx,%4 ; " | |
| 26 | - "mul %5 ; " | |
| 27 | - "xor %5,%5 ; " | |
| 28 | - "add %4,%%eax ; " | |
| 29 | - "adc %5,%%edx ; " | |
| 30 | - : "=A" (product), "=r" (tmp1), "=r" (tmp2) | |
| 31 | - : "a" ((u32)delta), "1" ((u32)(delta >> 32)), "2" (mul_frac) ); | |
| 32 | -#elif defined(__x86_64__) | |
| 33 | - __asm__ ( | |
| 34 | - "mul %%rdx ; shrd $32,%%rdx,%%rax" | |
| 35 | - : "=a" (product) : "0" (delta), "d" ((u64)mul_frac) ); | |
| 36 | -#else | |
| 37 | -#error implement me! | |
| 38 | -#endif | |
| 39 | - | |
| 40 | - return product; | |
| 41 | -} | |
| 42 | -#endif | |
| 43 | ||
| 44 | #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34) && \ | |
| 45 | LINUX_VERSION_CODE != KERNEL_VERSION(2,6,32) && defined(CONFIG_X86_64) |