1 files changed, 6 insertions, 8 deletions

diff --git a/drivers/macintosh/rack-meter.c b/drivers/macintosh/rack-meter.c
index 2637c139777b..6dc26b61219b 100644
--- a/drivers/macintosh/rack-meter.c
+++ b/drivers/macintosh/rack-meter.c
@@ -81,13 +81,13 @@ static int rackmeter_ignore_nice;
  */
 static inline cputime64_t get_cpu_idle_time(unsigned int cpu)
 {
-        cputime64_t retval;
+        u64 retval;
 
-        retval = cputime64_add(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 = cputime64_add(retval, kstat_cpu(cpu).cpustat.nice);
+                retval += kcpustat_cpu(cpu).cpustat[CPUTIME_NICE];
 
         return retval;
 }
@@ -220,13 +220,11 @@ static void rackmeter_do_timer(struct work_struct *work)
         int i, offset, load, cumm, pause;
 
         cur_jiffies = jiffies64_to_cputime64(get_jiffies_64());
-        total_ticks = (unsigned int)cputime64_sub(cur_jiffies,
-                                                  rcpu->prev_wall);
+        total_ticks = (unsigned int) (cur_jiffies - rcpu->prev_wall);
         rcpu->prev_wall = cur_jiffies;
 
         total_idle_ticks = get_cpu_idle_time(cpu);
-        idle_ticks = (unsigned int) cputime64_sub(total_idle_ticks,
-                                rcpu->prev_idle);
+        idle_ticks = (unsigned int) (total_idle_ticks - rcpu->prev_idle);
         rcpu->prev_idle = total_idle_ticks;
 
         /* We do a very dumb calculation to update the LEDs for now,