From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 15 Dec 2011 07:21:21 +0000 (+0100)
Subject: Merge commit 'v3.2-rc5' into sched/core
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=6a54aebf6978e9f296a4d3da3e40af425163c22e;p=deliverable%2Flinux.git

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

Merge reason: Pick up the latest fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

6a54aebf6978e9f296a4d3da3e40af425163c22e
diff --cc fs/proc/stat.c
index 8a6ab666e9f8,2a30d67dd6b8..2527a68057fc
--- a/fs/proc/stat.c
+++ b/fs/proc/stat.c
@@@ -28,10 -29,10 +28,10 @@@ static u64 get_idle_time(int cpu
  
  	if (idle_time == -1ULL) {
  		/* !NO_HZ so we can rely on cpustat.idle */
 -		idle = kstat_cpu(cpu).cpustat.idle;
 -		idle = cputime64_add(idle, arch_idle_time(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;
  }
@@@ -42,9 -44,9 +42,9 @@@ static u64 get_iowait_time(int cpu
  
  	if (iowait_time == -1ULL)
  		/* !NO_HZ so we can rely on cpustat.iowait */
 -		iowait = kstat_cpu(cpu).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;
  }