From 04ece8fe8c00543eb86916ec54fbb7169a05946e Mon Sep 17 00:00:00 2001
From: David Fries <david@fries.net>
Date: Wed, 6 Feb 2008 01:38:04 -0800
Subject: [PATCH] --- yaml --- r: 83482 b: refs/heads/master c:
 6ffc787a4492ac627315aaeafdfdc0a5c3028582 h: refs/heads/master v: v3

---
 [refs]                     |  2 +-
 trunk/include/linux/acct.h |  4 ++++
 trunk/kernel/time.c        | 11 +++++++++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0f69215d4fbd..297caaeb57f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82f560874e88bd1fd8c98a6254d65a1dffab3876
+refs/heads/master: 6ffc787a4492ac627315aaeafdfdc0a5c3028582
diff --git a/trunk/include/linux/acct.h b/trunk/include/linux/acct.h
index 302eb727ecb8..e8cae54e8d88 100644
--- a/trunk/include/linux/acct.h
+++ b/trunk/include/linux/acct.h
@@ -173,7 +173,11 @@ typedef struct acct acct_t;
 static inline u32 jiffies_to_AHZ(unsigned long x)
 {
 #if (TICK_NSEC % (NSEC_PER_SEC / AHZ)) == 0
+# if HZ < AHZ
+	return x * (AHZ / HZ);
+# else
 	return x / (HZ / AHZ);
+# endif
 #else
         u64 tmp = (u64)x * TICK_NSEC;
         do_div(tmp, (NSEC_PER_SEC / AHZ));
diff --git a/trunk/kernel/time.c b/trunk/kernel/time.c
index 4064c0566e77..be5c8cb93582 100644
--- a/trunk/kernel/time.c
+++ b/trunk/kernel/time.c
@@ -566,7 +566,11 @@ EXPORT_SYMBOL(jiffies_to_timeval);
 clock_t jiffies_to_clock_t(long x)
 {
 #if (TICK_NSEC % (NSEC_PER_SEC / USER_HZ)) == 0
+# if HZ < USER_HZ
+	return x * (USER_HZ / HZ);
+# else
 	return x / (HZ / USER_HZ);
+# endif
 #else
 	u64 tmp = (u64)x * TICK_NSEC;
 	do_div(tmp, (NSEC_PER_SEC / USER_HZ));
@@ -599,7 +603,12 @@ EXPORT_SYMBOL(clock_t_to_jiffies);
 u64 jiffies_64_to_clock_t(u64 x)
 {
 #if (TICK_NSEC % (NSEC_PER_SEC / USER_HZ)) == 0
+# if HZ < USER_HZ
+	x *= USER_HZ;
+	do_div(x, HZ);
+# else
 	do_div(x, HZ / USER_HZ);
+# endif
 #else
 	/*
 	 * There are better ways that don't overflow early,
@@ -611,7 +620,6 @@ u64 jiffies_64_to_clock_t(u64 x)
 #endif
 	return x;
 }
-
 EXPORT_SYMBOL(jiffies_64_to_clock_t);
 
 u64 nsec_to_clock_t(u64 x)
@@ -646,7 +654,6 @@ u64 get_jiffies_64(void)
 	} while (read_seqretry(&xtime_lock, seq));
 	return ret;
 }
-
 EXPORT_SYMBOL(get_jiffies_64);
 #endif