Merge branch 'sched/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into cputime-tip

Conflicts:
	drivers/cpufreq/cpufreq_conservative.c
	drivers/cpufreq/cpufreq_ondemand.c
	drivers/macintosh/rack-meter.c
	fs/proc/stat.c
	fs/proc/uptime.c
	kernel/sched/core.c

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/macintosh/rack-meter.c b/drivers/macintosh/rack-meter.c
index 909908ebf164..6dc26b61219b 100644
--- a/drivers/macintosh/rack-meter.c
+++ b/drivers/macintosh/rack-meter.c
@@ -81,12 +81,13 @@ static int rackmeter_ignore_nice;
  */
 static inline cputime64_t get_cpu_idle_time(unsigned int cpu)
 {
-        cputime64_t retval;
+        u64 retval;
 
-        retval = kstat_cpu(cpu).cpustat.idle + kstat_cpu(cpu).cpustat.iowait;
+        retval = kcpustat_cpu(cpu).cpustat[CPUTIME_IDLE] +
+                 kcpustat_cpu(cpu).cpustat[CPUTIME_IOWAIT];
 
         if (rackmeter_ignore_nice)
-                retval += kstat_cpu(cpu).cpustat.nice;
+                retval += kcpustat_cpu(cpu).cpustat[CPUTIME_NICE];
 
         return retval;
 }