From 9664ab4c26d8291c3c2eeb5fdf23e70ea3a8520f Mon Sep 17 00:00:00 2001
From: Kusanagi Kouichi <slash@ac.auone-net.jp>
Date: Fri, 5 Nov 2010 20:04:42 +0900
Subject: [PATCH] --- yaml --- r: 221819 b: refs/heads/master c:
 1f523bf36734375dd6e986c9f47f010d00a8caca h: refs/heads/master i:   221817:
 487bc16153200ac0c5fa032bdd90333b42584882   221815:
 4ef765bc45e53fb88df444af3b48e68d22a25d7e v: v3

---
 [refs]                          |  2 +-
 trunk/arch/x86/kernel/pvclock.c | 38 ---------------------------------
 2 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/[refs] b/[refs]
index ec7810f23099..e1a548b557a7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a8dcbd6cd2270f912ca141547d9296ce08abe4a
+refs/heads/master: 1f523bf36734375dd6e986c9f47f010d00a8caca
diff --git a/trunk/arch/x86/kernel/pvclock.c b/trunk/arch/x86/kernel/pvclock.c
index bab3b9e6f66d..008b91eefa18 100644
--- a/trunk/arch/x86/kernel/pvclock.c
+++ b/trunk/arch/x86/kernel/pvclock.c
@@ -41,44 +41,6 @@ void pvclock_set_flags(u8 flags)
 	valid_flags = flags;
 }
 
-/*
- * Scale a 64-bit delta by scaling and multiplying by a 32-bit fraction,
- * yielding a 64-bit result.
- */
-static inline u64 scale_delta(u64 delta, u32 mul_frac, int shift)
-{
-	u64 product;
-#ifdef __i386__
-	u32 tmp1, tmp2;
-#endif
-
-	if (shift < 0)
-		delta >>= -shift;
-	else
-		delta <<= shift;
-
-#ifdef __i386__
-	__asm__ (
-		"mul  %5       ; "
-		"mov  %4,%%eax ; "
-		"mov  %%edx,%4 ; "
-		"mul  %5       ; "
-		"xor  %5,%5    ; "
-		"add  %4,%%eax ; "
-		"adc  %5,%%edx ; "
-		: "=A" (product), "=r" (tmp1), "=r" (tmp2)
-		: "a" ((u32)delta), "1" ((u32)(delta >> 32)), "2" (mul_frac) );
-#elif defined(__x86_64__)
-	__asm__ (
-		"mul %%rdx ; shrd $32,%%rdx,%%rax"
-		: "=a" (product) : "0" (delta), "d" ((u64)mul_frac) );
-#else
-#error implement me!
-#endif
-
-	return product;
-}
-
 static u64 pvclock_get_nsec_offset(struct pvclock_shadow_time *shadow)
 {
 	u64 delta = native_read_tsc() - shadow->tsc_timestamp;