]> err.no Git - linux-2.6/commitdiff
speed up jiffies conversion functions if HZ==USER_HZ
authorAndrew Morton <akpm@linux-foundation.org>
Wed, 6 Feb 2008 09:38:06 +0000 (01:38 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 6 Feb 2008 18:41:10 +0000 (10:41 -0800)
Avoid calling do_div(x, 1) in this case.

Cc: David Fries <david@fries.net>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
kernel/time.c

index be5c8cb935824e5b83e9529c0255d9bf20f8e504..33af3e55570dfc5d8fe74aba067d2e26591c1a91 100644 (file)
@@ -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
        /*