summaryrefslogtreecommitdiff
path: root/sysutils/xenkernel41/patches/patch-xen_arch_x86_time.c
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/xenkernel41/patches/patch-xen_arch_x86_time.c')
-rw-r--r--sysutils/xenkernel41/patches/patch-xen_arch_x86_time.c19
1 files changed, 4 insertions, 15 deletions
diff --git a/sysutils/xenkernel41/patches/patch-xen_arch_x86_time.c b/sysutils/xenkernel41/patches/patch-xen_arch_x86_time.c
index 351ff072965..6c7e278c2a2 100644
--- a/sysutils/xenkernel41/patches/patch-xen_arch_x86_time.c
+++ b/sysutils/xenkernel41/patches/patch-xen_arch_x86_time.c
@@ -1,8 +1,6 @@
-$NetBSD: patch-xen_arch_x86_time.c,v 1.1 2013/04/11 19:57:52 joerg Exp $
-
---- xen/arch/x86/time.c.orig 2013-03-25 14:01:22.000000000 +0000
-+++ xen/arch/x86/time.c
-@@ -105,7 +105,7 @@ static inline u32 mul_frac(u32 multiplic
+--- xen/arch/x86/time.c.orig 2013-09-10 06:42:18.000000000 +0000
++++ xen/arch/x86/time.c 2013-09-11 14:30:13.000000000 +0000
+@@ -105,7 +105,7 @@
{
u32 product_int, product_frac;
asm (
@@ -11,7 +9,7 @@ $NetBSD: patch-xen_arch_x86_time.c,v 1.1 2013/04/11 19:57:52 joerg Exp $
: "=a" (product_frac), "=d" (product_int)
: "0" (multiplicand), "r" (multiplier) );
return product_int;
-@@ -129,10 +129,10 @@ static inline u64 scale_delta(u64 delta,
+@@ -129,10 +129,10 @@
#ifdef CONFIG_X86_32
asm (
@@ -24,12 +22,3 @@ $NetBSD: patch-xen_arch_x86_time.c,v 1.1 2013/04/11 19:57:52 joerg Exp $
"xor %5,%5 ; "
"add %4,%%eax ; "
"adc %5,%%edx ; "
-@@ -140,7 +140,7 @@ static inline u64 scale_delta(u64 delta,
- : "a" ((u32)delta), "1" ((u32)(delta >> 32)), "2" (scale->mul_frac) );
- #else
- asm (
-- "mul %2 ; shrd $32,%1,%0"
-+ "mulq %2 ; shrd $32,%1,%0"
- : "=a" (product), "=d" (delta)
- : "rm" (delta), "0" ((u64)scale->mul_frac) );
- #endif