diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2011-12-19 19:23:15 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2011-12-19 19:23:15 +0100 |
| commit | 612ef28a045efadb3a98d4492ead7806a146485d (patch) | |
| tree | 05621c87b37e91c27b06d450d76adffe97ce9666 /drivers/macintosh | |
| parent | c3e0ef9a298e028a82ada28101ccd5cf64d209ee (diff) | |
| parent | 07cde2608a3b5c66515363f1b53623b1536b9785 (diff) | |
| download | linux-3.10-612ef28a045efadb3a98d4492ead7806a146485d.tar.gz linux-3.10-612ef28a045efadb3a98d4492ead7806a146485d.tar.bz2 linux-3.10-612ef28a045efadb3a98d4492ead7806a146485d.zip | |
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
Diffstat (limited to 'drivers/macintosh')
| -rw-r--r-- | drivers/macintosh/rack-meter.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/macintosh/rack-meter.c b/drivers/macintosh/rack-meter.c index 909908ebf16..6dc26b61219 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; } |