diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2008-02-06 10:38:06 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-06 19:41:10 +0100 |
| commit | ec03d7073971e20a866448d62c992a168201ac82 (patch) | |
| tree | 16b1954017d97ff8a40ca4ee78fd8f837c710a14 | |
| parent | system timer: fix crash in <100Hz system timer (diff) | |
| download | linux-ec03d7073971e20a866448d62c992a168201ac82.tar.xz linux-ec03d7073971e20a866448d62c992a168201ac82.zip | |
speed up jiffies conversion functions if HZ==USER_HZ
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>
| -rw-r--r-- | kernel/time.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/time.c b/kernel/time.c index be5c8cb93582..33af3e55570d 100644 --- a/kernel/time.c +++ b/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 /* |