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 /arch/x86 | |
| parent | Merge tag 'xfs-for-linus-4.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs (diff) | |
| parent | nohz: Remove useless argument on tick_nohz_task_switch() (diff) | |
| download | linux-dev-555ee95a0a5a525ad2f1654fab0bd157de832b4f.tar.xz linux-dev-555ee95a0a5a525ad2f1654fab0bd157de832b4f.zip | |
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 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/apm_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c index 927ec9235947..052c9c3026cc 100644 --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c @@ -919,7 +919,7 @@ recalc: } else if (jiffies_since_last_check > idle_period) { unsigned int idle_percentage; - idle_percentage = stime - last_stime; + idle_percentage = cputime_to_jiffies(stime - last_stime); idle_percentage *= 100; idle_percentage /= jiffies_since_last_check; use_apm_idle = (idle_percentage > idle_threshold); |