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

Pull scheduler changes for v3.4 from Ingo Molnar

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (27 commits)
  printk: Make it compile with !CONFIG_PRINTK
  sched/x86: Fix overflow in cyc2ns_offset
  sched: Fix nohz load accounting -- again!
  sched: Update yield() docs
  printk/sched: Introduce special printk_sched() for those awkward moments
  sched/nohz: Correctly initialize 'next_balance' in 'nohz' idle balancer
  sched: Cleanup cpu_active madness
  sched: Fix load-balance wreckage
  sched: Clean up parameter passing of proc_sched_autogroup_set_nice()
  sched: Ditch per cgroup task lists for load-balancing
  sched: Rename load-balancing fields
  sched: Move load-balancing arguments into helper struct
  sched/rt: Do not submit new work when PI-blocked
  sched/rt: Prevent idle task boosting
  sched/wait: Add __wake_up_all_locked() API
  sched/rt: Document scheduler related skip-resched-check sites
  sched/rt: Use schedule_preempt_disabled()
  sched/rt: Add schedule_preempt_disabled()
  sched/rt: Do not throttle when PI boosting
  sched/rt: Keep period timer ticking when rt throttling is active
  ...

2 files changed, 6 insertions, 12 deletions

diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
index f793742eec2b..935fdbcd88c2 100644
--- a/arch/sparc/kernel/process_32.c
+++ b/arch/sparc/kernel/process_32.c
@@ -113,9 +113,7 @@ void cpu_idle(void)
                         while (!need_resched())
                                 cpu_relax();
                 }
-                preempt_enable_no_resched();
-                schedule();
-                preempt_disable();
+                schedule_preempt_disabled();
                 check_pgt_cache();
         }
 }
@@ -138,9 +136,7 @@ void cpu_idle(void)
                         while (!need_resched())
                                 cpu_relax();
                 }
-                preempt_enable_no_resched();
-                schedule();
-                preempt_disable();
+                schedule_preempt_disabled();
                 check_pgt_cache();
         }
 }
diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
index 39d8b05201a2..06b5b5fc20c7 100644
--- a/arch/sparc/kernel/process_64.c
+++ b/arch/sparc/kernel/process_64.c
@@ -104,15 +104,13 @@ void cpu_idle(void)
                 rcu_idle_exit();
                 tick_nohz_idle_exit();
 
-                preempt_enable_no_resched();
-
 #ifdef CONFIG_HOTPLUG_CPU
-                if (cpu_is_offline(cpu))
+                if (cpu_is_offline(cpu)) {
+                        sched_preempt_enable_no_resched();
                         cpu_play_dead();
+                }
 #endif
-
-                schedule();
-                preempt_disable();
+                schedule_preempt_disabled();
         }
 }