Merge tag 'v3.11-rc2' into sched/core

Merge in Linux 3.11-rc2, to provide a post-merge-window development base.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --combined kernel/sched/core.c
index f73787159188468de7b4929b27e627d4dfdd3732,b7c32cb7bfebbd5912f06a421decb87b15c34bf9..b7415cfdd7de4e95f5eb9a0efd30542b95e446e6
--- 1/kernel/sched/core.c
--- 2/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@@ -2660,7 -2660,7 +2660,7 @@@ void __wake_up_sync_key(wait_queue_head
        if (unlikely(!q))
                return;
  
 -      if (unlikely(!nr_exclusive))
 +      if (unlikely(nr_exclusive != 1))
                wake_flags = 0;
  
        spin_lock_irqsave(&q->lock, flags);
@@@ -4133,7 -4133,7 +4133,7 @@@ void show_state_filter(unsigned long st
                debug_show_all_locks();
  }
  
- void __cpuinit init_idle_bootup_task(struct task_struct *idle)
+ void init_idle_bootup_task(struct task_struct *idle)
  {
        idle->sched_class = &idle_sched_class;
  }
@@@ -4146,7 -4146,7 +4146,7 @@@
   * NOTE: this function does not set the idle thread's NEED_RESCHED
   * flag, to make booting more robust.
   */
- void __cpuinit init_idle(struct task_struct *idle, int cpu)
+ void init_idle(struct task_struct *idle, int cpu)
  {
        struct rq *rq = cpu_rq(cpu);
        unsigned long flags;
@@@ -4630,7 -4630,7 +4630,7 @@@ static void set_rq_offline(struct rq *r
   * migration_call - callback that gets triggered when a CPU is added.
   * Here we can start up the necessary migration thread for the new CPU.
   */
- static int __cpuinit
+ static int
  migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu)
  {
        int cpu = (long)hcpu;
@@@ -4684,12 -4684,12 +4684,12 @@@
   * happens before everything else.  This has to be lower priority than
   * the notifier in the perf_event subsystem, though.
   */
- static struct notifier_block __cpuinitdata migration_notifier = {
+ static struct notifier_block migration_notifier = {
        .notifier_call = migration_call,
        .priority = CPU_PRI_MIGRATION,
  };
  
- static int __cpuinit sched_cpu_active(struct notifier_block *nfb,
+ static int sched_cpu_active(struct notifier_block *nfb,
                                      unsigned long action, void *hcpu)
  {
        switch (action & ~CPU_TASKS_FROZEN) {
@@@ -4702,7 -4702,7 +4702,7 @@@
        }
  }
  
- static int __cpuinit sched_cpu_inactive(struct notifier_block *nfb,
+ static int sched_cpu_inactive(struct notifier_block *nfb,
                                        unsigned long action, void *hcpu)
  {
        switch (action & ~CPU_TASKS_FROZEN) {