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

Pull scheduler updates from Ingo Molnar:
 "The main changes in this (fairly busy) cycle were:

   - There was a class of scheduler bugs related to forgetting to update
     the rq-clock timestamp which can cause weird and hard to debug
     problems, so there's a new debug facility for this: which uncovered
     a whole lot of bugs which convinced us that we want to keep the
     debug facility.

     (Peter Zijlstra, Matt Fleming)

   - Various cputime related updates: eliminate cputime and use u64
     nanoseconds directly, simplify and improve the arch interfaces,
     implement delayed accounting more widely, etc. - (Frederic
     Weisbecker)

   - Move code around for better structure plus cleanups (Ingo Molnar)

   - Move IO schedule accounting deeper into the scheduler plus related
     changes to improve the situation (Tejun Heo)

   - ... plus a round of sched/rt and sched/deadline fixes, plus other
     fixes, updats and cleanups"

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (85 commits)
  sched/core: Remove unlikely() annotation from sched_move_task()
  sched/autogroup: Rename auto_group.[ch] to autogroup.[ch]
  sched/topology: Split out scheduler topology code from core.c into topology.c
  sched/core: Remove unnecessary #include headers
  sched/rq_clock: Consolidate the ordering of the rq_clock methods
  delayacct: Include <uapi/linux/taskstats.h>
  sched/core: Clean up comments
  sched/rt: Show the 'sched_rr_timeslice' SCHED_RR timeslice tuning knob in milliseconds
  sched/clock: Add dummy clear_sched_clock_stable() stub function
  sched/cputime: Remove generic asm headers
  sched/cputime: Remove unused nsec_to_cputime()
  s390, sched/cputime: Remove unused cputime definitions
  powerpc, sched/cputime: Remove unused cputime definitions
  s390, sched/cputime: Make arch_cpu_idle_time() to return nsecs
  ia64, sched/cputime: Remove unused cputime definitions
  ia64: Convert vtime to use nsec units directly
  ia64, sched/cputime: Move the nsecs based cputime headers to the last arch using it
  sched/cputime: Remove jiffies based cputime
  sched/cputime, vtime: Return nsecs instead of cputime_t to account
  sched/cputime: Complete nsec conversion of tick based accounting
  ...

5 files changed, 20 insertions, 21 deletions

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index cc475eff90b3..3e9b319a2e79 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -132,7 +132,7 @@ static inline u64 get_cpu_idle_time_jiffy(unsigned int cpu, u64 *wall)
         u64 cur_wall_time;
         u64 busy_time;
 
-        cur_wall_time = jiffies64_to_cputime64(get_jiffies_64());
+        cur_wall_time = jiffies64_to_nsecs(get_jiffies_64());
 
         busy_time = kcpustat_cpu(cpu).cpustat[CPUTIME_USER];
         busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_SYSTEM];
@@ -143,9 +143,9 @@ static inline u64 get_cpu_idle_time_jiffy(unsigned int cpu, u64 *wall)
 
         idle_time = cur_wall_time - busy_time;
         if (wall)
-                *wall = cputime_to_usecs(cur_wall_time);
+                *wall = div_u64(cur_wall_time, NSEC_PER_USEC);
 
-        return cputime_to_usecs(idle_time);
+        return div_u64(idle_time, NSEC_PER_USEC);
 }
 
 u64 get_cpu_idle_time(unsigned int cpu, u64 *wall, int io_busy)
diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
index 0196467280bd..631bd2c86c5e 100644
--- a/drivers/cpufreq/cpufreq_governor.c
+++ b/drivers/cpufreq/cpufreq_governor.c
@@ -152,7 +152,7 @@ unsigned int dbs_update(struct cpufreq_policy *policy)
                 if (ignore_nice) {
                         u64 cur_nice = kcpustat_cpu(j).cpustat[CPUTIME_NICE];
 
-                        idle_time += cputime_to_usecs(cur_nice - j_cdbs->prev_cpu_nice);
+                        idle_time += div_u64(cur_nice - j_cdbs->prev_cpu_nice, NSEC_PER_USEC);
                         j_cdbs->prev_cpu_nice = cur_nice;
                 }
 
diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c
index ac284e66839c..17048bbec287 100644
--- a/drivers/cpufreq/cpufreq_stats.c
+++ b/drivers/cpufreq/cpufreq_stats.c
@@ -13,7 +13,6 @@
 #include <linux/cpufreq.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <linux/cputime.h>
 
 static DEFINE_SPINLOCK(cpufreq_stats_lock);
 
diff --git a/drivers/isdn/mISDN/stack.c b/drivers/isdn/mISDN/stack.c
index 9cb4b621fbc3..b324474c0c12 100644
--- a/drivers/isdn/mISDN/stack.c
+++ b/drivers/isdn/mISDN/stack.c
@@ -203,7 +203,7 @@ mISDNStackd(void *data)
 {
         struct mISDNstack *st = data;
 #ifdef MISDN_MSG_STATS
-        cputime_t utime, stime;
+        u64 utime, stime;
 #endif
         int err = 0;
 
@@ -308,7 +308,7 @@ mISDNStackd(void *data)
                st->stopped_cnt);
         task_cputime(st->thread, &utime, &stime);
         printk(KERN_DEBUG
-               "mISDNStackd daemon for %s utime(%ld) stime(%ld)\n",
+               "mISDNStackd daemon for %s utime(%llu) stime(%llu)\n",
                dev_name(&st->dev->dev), utime, stime);
         printk(KERN_DEBUG
                "mISDNStackd daemon for %s nvcsw(%ld) nivcsw(%ld)\n",
diff --git a/drivers/macintosh/rack-meter.c b/drivers/macintosh/rack-meter.c
index 775527135b93..e199fd6c71ce 100644
--- a/drivers/macintosh/rack-meter.c
+++ b/drivers/macintosh/rack-meter.c
@@ -52,8 +52,8 @@ struct rackmeter_dma {
 struct rackmeter_cpu {
         struct delayed_work     sniffer;
         struct rackmeter        *rm;
-        cputime64_t             prev_wall;
-        cputime64_t             prev_idle;
+        u64                     prev_wall;
+        u64                     prev_idle;
         int                     zero;
 } ____cacheline_aligned;
 
@@ -81,7 +81,7 @@ static int rackmeter_ignore_nice;
 /* This is copied from cpufreq_ondemand, maybe we should put it in
  * a common header somewhere
  */
-static inline cputime64_t get_cpu_idle_time(unsigned int cpu)
+static inline u64 get_cpu_idle_time(unsigned int cpu)
 {
         u64 retval;
 
@@ -217,23 +217,23 @@ static void rackmeter_do_timer(struct work_struct *work)
                 container_of(work, struct rackmeter_cpu, sniffer.work);
         struct rackmeter *rm = rcpu->rm;
         unsigned int cpu = smp_processor_id();
-        cputime64_t cur_jiffies, total_idle_ticks;
-        unsigned int total_ticks, idle_ticks;
+        u64 cur_nsecs, total_idle_nsecs;
+        u64 total_nsecs, idle_nsecs;
         int i, offset, load, cumm, pause;
 
-        cur_jiffies = jiffies64_to_cputime64(get_jiffies_64());
-        total_ticks = (unsigned int) (cur_jiffies - rcpu->prev_wall);
-        rcpu->prev_wall = cur_jiffies;
+        cur_nsecs = jiffies64_to_nsecs(get_jiffies_64());
+        total_nsecs = cur_nsecs - rcpu->prev_wall;
+        rcpu->prev_wall = cur_nsecs;
 
-        total_idle_ticks = get_cpu_idle_time(cpu);
-        idle_ticks = (unsigned int) (total_idle_ticks - rcpu->prev_idle);
-        idle_ticks = min(idle_ticks, total_ticks);
-        rcpu->prev_idle = total_idle_ticks;
+        total_idle_nsecs = get_cpu_idle_time(cpu);
+        idle_nsecs = total_idle_nsecs - rcpu->prev_idle;
+        idle_nsecs = min(idle_nsecs, total_nsecs);
+        rcpu->prev_idle = total_idle_nsecs;
 
         /* We do a very dumb calculation to update the LEDs for now,
          * we'll do better once we have actual PWM implemented
          */
-        load = (9 * (total_ticks - idle_ticks)) / total_ticks;
+        load = div64_u64(9 * (total_nsecs - idle_nsecs), total_nsecs);
 
         offset = cpu << 3;
         cumm = 0;
@@ -278,7 +278,7 @@ static void rackmeter_init_cpu_sniffer(struct rackmeter *rm)
                         continue;
                 rcpu = &rm->cpu[cpu];
                 rcpu->prev_idle = get_cpu_idle_time(cpu);
-                rcpu->prev_wall = jiffies64_to_cputime64(get_jiffies_64());
+                rcpu->prev_wall = jiffies64_to_nsecs(get_jiffies_64());
                 schedule_delayed_work_on(cpu, &rm->cpu[cpu].sniffer,
                                          msecs_to_jiffies(CPU_SAMPLING_RATE));
         }