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
 	/*