diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-03 21:58:57 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-03 21:58:57 +0400 |
| commit | ddc5057c1c1fb3e99afeeef45d2b8ff9597e6707 (patch) | |
| tree | 801e4842f3a4dce2d777336b54f3caf075975025 /kernel/time/jiffies.c | |
| parent | fcc1d2a9cea4ba97c9800e1de0748003bba07335 (diff) | |
| parent | 4e250fdde9be50581c7dd5fed88c9b9960615314 (diff) | |
| download | linux-ddc5057c1c1fb3e99afeeef45d2b8ff9597e6707.tar.xz | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Ingo Molnar:
"One regression fix, and a couple of cleanups that clean up the code
flow in areas that had high-profile bugs recently."
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
time: Remove all direct references to timekeeper
time: Clean up offs_real/wall_to_mono and offs_boot/total_sleep_time updates
time: Clean up stray newlines
time/jiffies: Rename ACTHZ to SHIFTED_HZ
time/jiffies: Allow CLOCK_TICK_RATE to be undefined
time: Fix casting issue in tk_set_xtime and tk_xtime_add
Diffstat (limited to 'kernel/time/jiffies.c')
| -rw-r--r-- | kernel/time/jiffies.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/jiffies.c b/kernel/time/jiffies.c index a470154e0408..46da0537c10b 100644 --- a/kernel/time/jiffies.c +++ b/kernel/time/jiffies.c @@ -37,7 +37,7 @@ * requested HZ value. It is also not recommended * for "tick-less" systems. */ -#define NSEC_PER_JIFFY ((u32)((((u64)NSEC_PER_SEC)<<8)/ACTHZ)) +#define NSEC_PER_JIFFY ((u32)((((u64)NSEC_PER_SEC)<<8)/SHIFTED_HZ)) /* Since jiffies uses a simple NSEC_PER_JIFFY multiplier * conversion, the .shift value could be zero. However |