From b8d965083bcc116c53393ea1dd767b15c5073253 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 6 Feb 2008 01:38:06 -0800
Subject: [PATCH] --- yaml --- r: 83483 b: refs/heads/master c:
 ec03d7073971e20a866448d62c992a168201ac82 h: refs/heads/master i:   83481:
 923395f93fe7960ee64d5f50974936e4f43df262   83479:
 ee3f81faf899409c5a680b90fe9d4e09c2249473 v: v3

---
 [refs]              | 2 +-
 trunk/kernel/time.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 297caaeb57f5..7e019ed98956 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ffc787a4492ac627315aaeafdfdc0a5c3028582
+refs/heads/master: ec03d7073971e20a866448d62c992a168201ac82
diff --git a/trunk/kernel/time.c b/trunk/kernel/time.c
index be5c8cb93582..33af3e55570d 100644
--- a/trunk/kernel/time.c
+++ b/trunk/kernel/time.c
@@ -606,8 +606,10 @@ u64 jiffies_64_to_clock_t(u64 x)
 # if HZ < USER_HZ
 	x *= USER_HZ;
 	do_div(x, HZ);
-# else
+# elif HZ > USER_HZ
 	do_div(x, HZ / USER_HZ);
+# else
+	/* Nothing to do */
 # endif
 #else
 	/*