Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/x86/include/asm/pvclock.h

+1 −1
Original line number Diff line number Diff line
@@ -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),