diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-07 07:45:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-07 07:45:43 -0700 |
| commit | 768b56f598694ed7215723d402ca3b388106b042 (patch) | |
| tree | 9049ed79b7c3447c770de75b4e723e4754d62fd8 /arch | |
| parent | ddf28352b80c86754a6424e3a61e8bdf9213b3c7 (diff) | |
| parent | 3b217116edaac634bf31e85c35708298059a8171 (diff) | |
| download | linux-3.10-768b56f598694ed7215723d402ca3b388106b042.tar.gz linux-3.10-768b56f598694ed7215723d402ca3b388106b042.tar.bz2 linux-3.10-768b56f598694ed7215723d402ca3b388106b042.zip | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/include/asm/pvclock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/pvclock.h b/arch/x86/include/asm/pvclock.h index a518c0a4504..c59cc97fe6c 100644 --- a/arch/x86/include/asm/pvclock.h +++ b/arch/x86/include/asm/pvclock.h @@ -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) ); #elif defined(__x86_64__) __asm__ ( - "mul %[mul_frac] ; shrd $32, %[hi], %[lo]" + "mulq %[mul_frac] ; shrd $32, %[hi], %[lo]" : [lo]"=a"(product), [hi]"=d"(tmp) : "0"(delta), |