diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-07-31 10:27:19 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-07-31 10:28:53 +0200 |
commit | 555ee95a0a5a525ad2f1654fab0bd157de832b4f (patch) | |
tree | 5ff341bedaa848027d5eba1e2a9fbfaeb9501250 /include/linux/jiffies.h | |
parent | 8400935737bf02d97da281bdcd139a421624b6ba (diff) | |
parent | de734f89b67c2df30e35a09e7e56a3659e5b6ac6 (diff) |
Merge branch 'timers/nohz-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into timers/nohz
Pull NOHZ updates from Frederic Weisbecker:
- Fix some jiffies based cputime assumptions. No real harm because the
concerned code isn't used by full dynticks.
- Simplify jiffies <-> usecs conversions. Remove dead code.
- Remove early hacks on nohz full code that avoided messing up idle
nohz internals. Now nohz integrates well full and idle and such hack
have become needless.
- Restart nohz full tick from irq exit. A simplification and a
preparation for future optimization on scheduler kick to nohz full.
- Simple code cleanups.
- Tile driver isolation enhancement on top of nohz.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/jiffies.h')
-rw-r--r-- | include/linux/jiffies.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h index 535fd3bb1ba8..7c6febede6ba 100644 --- a/include/linux/jiffies.h +++ b/include/linux/jiffies.h @@ -363,18 +363,11 @@ static inline unsigned long msecs_to_jiffies(const unsigned int m) } extern unsigned long __usecs_to_jiffies(const unsigned int u); -#if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ) +#if !(USEC_PER_SEC % HZ) static inline unsigned long _usecs_to_jiffies(const unsigned int u) { return (u + (USEC_PER_SEC / HZ) - 1) / (USEC_PER_SEC / HZ); } -#elif HZ > USEC_PER_SEC && !(HZ % USEC_PER_SEC) -static inline unsigned long _usecs_to_jiffies(const unsigned int u) -{ - return u * (HZ / USEC_PER_SEC); -} -static inline unsigned long _usecs_to_jiffies(const unsigned int u) -{ #else static inline unsigned long _usecs_to_jiffies(const unsigned int u) { |