git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 and git://git.infradea...
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
pvclock.h
diff --git
a/arch/x86/include/asm/pvclock.h
b/arch/x86/include/asm/pvclock.h
index
a518c0a
..
c59cc97
100644
(file)
--- 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]"
+ "mul
q
%[mul_frac] ; shrd $32, %[hi], %[lo]"
: [lo]"=a"(product),
[hi]"=d"(tmp)
: "0"(delta),