lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'v3.2-rc5' into sched/core

Browse Source 
Merge reason: Pick up the latest fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2011-12-15 08:21:21 +01:00
parent 067491b731 dc47ce90c3
commit 6a54aebf69
1027 changed files with 10724 additions and 7810 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/proc/stat.c
View File

@@ -31,7 +31,7 @@ static u64 get_idle_time(int cpu)
idle = kcpustat_cpu(cpu).cpustat[CPUTIME_IDLE];
idle += arch_idle_time(cpu);
} else
idle = usecs_to_cputime(idle_time);
idle = nsecs_to_jiffies64(1000 * idle_time);
return idle;
}
@@ -44,7 +44,7 @@ static u64 get_iowait_time(int cpu)
/* !NO_HZ so we can rely on cpustat.iowait */
iowait = kcpustat_cpu(cpu).cpustat[CPUTIME_IOWAIT];
else
iowait = usecs_to_cputime(iowait_time);
iowait = nsecs_to_jiffies64(1000 * iowait_time);
return iowait;
}