Commit 768b56f5 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'kvm-updates/3.1' of git://github.com/avikivity/kvm

* 'kvm-updates/3.1' of git://github.com/avikivity/kvm:
  KVM: Fix instruction size issue in pvclock scaling
parents ddf28352 3b217116
...@@ -44,7 +44,7 @@ static inline u64 pvclock_scale_delta(u64 delta, u32 mul_frac, int shift) ...@@ -44,7 +44,7 @@ static inline u64 pvclock_scale_delta(u64 delta, u32 mul_frac, int shift)
: "a" ((u32)delta), "1" ((u32)(delta >> 32)), "2" (mul_frac) ); : "a" ((u32)delta), "1" ((u32)(delta >> 32)), "2" (mul_frac) );
#elif defined(__x86_64__) #elif defined(__x86_64__)
__asm__ ( __asm__ (
"mul %[mul_frac] ; shrd $32, %[hi], %[lo]" "mulq %[mul_frac] ; shrd $32, %[hi], %[lo]"
: [lo]"=a"(product), : [lo]"=a"(product),
[hi]"=d"(tmp) [hi]"=d"(tmp)
: "0"(delta), : "0"(delta),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment