Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
  sched: tweak the sched_runtime_limit tunable
  sched: skip updating rq's next_balance under null SD
  sched: fix broken SMT/MC optimizations
  sched: accounting regression since rc1
  sched: fix sysctl directory permissions
  sched: sched_clock_idle_[sleep|wakeup]_event()

1 files changed, 2 insertions, 1 deletions

diff --git a/kernel/sched_debug.c b/kernel/sched_debug.c
index 87e524762b85..ab18f45f2ab2 100644
--- a/kernel/sched_debug.c
+++ b/kernel/sched_debug.c
@@ -154,10 +154,11 @@ static void print_cpu(struct seq_file *m, int cpu)
         P(next_balance);
         P(curr->pid);
         P(clock);
+        P(idle_clock);
         P(prev_clock_raw);
         P(clock_warps);
         P(clock_overflows);
-        P(clock_unstable_events);
+        P(clock_deep_idle_events);
         P(clock_max_delta);
         P(cpu_load[0]);
         P(cpu_load[1]);