Commit 684baeb1 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'core-urgent-for-linus' of git://

Pull core kernel fixes from Ingo Molnar:
 "Two small fixes"

* 'core-urgent-for-linus' of git://
  Documentation: Reflect the new location of the NMI watchdog info
  nohz: Fix idle ticks in cpu summary line of /proc/stat
parents 4e3ab74c fd058733
......@@ -210,6 +210,8 @@ local_ops.txt
- semantics and behavior of local atomic operations.
- documentation on the runtime locking correctness validator.
- info on soft and hard lockup detectors (aka nmi_watchdog).
- full colour GIF image of Linux logo (penguin - Tux).
......@@ -240,8 +242,6 @@ netlabel/
- directory with information on the NetLabel subsystem.
- directory with info on various aspects of networking with Linux.
- info on NMI watchdog for SMP systems.
- documentation about no-mmu memory mapping support.
......@@ -45,10 +45,13 @@ static cputime64_t get_iowait_time(int cpu)
static u64 get_idle_time(int cpu)
u64 idle, idle_time = get_cpu_idle_time_us(cpu, NULL);
u64 idle, idle_time = -1ULL;
if (cpu_online(cpu))
idle_time = get_cpu_idle_time_us(cpu, NULL);
if (idle_time == -1ULL)
/* !NO_HZ so we can rely on cpustat.idle */
/* !NO_HZ or cpu offline so we can rely on cpustat.idle */
idle = kcpustat_cpu(cpu).cpustat[CPUTIME_IDLE];
idle = usecs_to_cputime64(idle_time);
......@@ -58,10 +61,13 @@ static u64 get_idle_time(int cpu)
static u64 get_iowait_time(int cpu)
u64 iowait, iowait_time = get_cpu_iowait_time_us(cpu, NULL);
u64 iowait, iowait_time = -1ULL;
if (cpu_online(cpu))
iowait_time = get_cpu_iowait_time_us(cpu, NULL);
if (iowait_time == -1ULL)
/* !NO_HZ so we can rely on cpustat.iowait */
/* !NO_HZ or cpu offline so we can rely on cpustat.iowait */
iowait = kcpustat_cpu(cpu).cpustat[CPUTIME_IOWAIT];
iowait = usecs_to_cputime64(iowait_time);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment