---

yaml --- r: 83483 b: refs/heads/master c: ec03d70 h: refs/heads/master i: 83481: 923395f 83479: ee3f81f v: v3
git-mirror · Feb 6, 2008 · b8d9650 · b8d9650
1 parent 04ece8f
commit b8d9650
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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
 	/*