---

yaml --- r: 155473 b: refs/heads/master c: 2ad7664 h: refs/heads/master i: 155471: bb390d2 v: v3
git-mirror · Jul 14, 2009 · f6f1e2a · f6f1e2a
1 parent 848a798
commit f6f1e2a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7473727be884293c8171775a148e1d174d1606e6
+refs/heads/master: 2ad76643ff58bb8841f391ea8327c14abe273ea3
diff --git a/trunk/arch/x86/kernel/pvclock.c b/trunk/arch/x86/kernel/pvclock.c
@@ -60,7 +60,7 @@ static inline u64 scale_delta(u64 delta, u32 mul_frac, int shift)
 		"adc  %5,%%edx ; "
 		: "=A" (product), "=r" (tmp1), "=r" (tmp2)
 		: "a" ((u32)delta), "1" ((u32)(delta >> 32)), "2" (mul_frac) );
-#elif __x86_64__
+#elif defined(__x86_64__)
 	__asm__ (
 		"mul %%rdx ; shrd $32,%%rdx,%%rax"
 		: "=a" (product) : "0" (delta), "d" ((u64)mul_frac) );