Merge remote-tracking branch 'cputime/cputime'

diff --cc drivers/cpufreq/cpufreq_ondemand.c
Simple merge

diff --cc fs/proc/stat.c
index 2a30d67dd6b81ea03c71b3bdea4fa50913a09ae4,762961f7c335db1d300785db80b9b85e8baf9206..714d5d131e76e3048e6353f284dc080ce5b34c23
--- 1/fs/proc/stat.c
--- 2/fs/proc/stat.c
+++ b/fs/proc/stat.c
@@@ -30,9 -30,9 +30,9 @@@ static cputime64_t get_idle_time(int cp
        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 += arch_idle_time(cpu);
        } else
 -              idle = usecs_to_cputime(idle_time);
 +              idle = nsecs_to_jiffies64(1000 * idle_time);
  
        return idle;
  }

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/sched.c
Simple merge