Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Fri, 22 Jul 2011 23:45:02 +0000 (16:45 -0700)]
* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (24 commits)
  sched: Cleanup duplicate local variable in [enqueue|dequeue]_task_fair
  sched: Replace use of entity_key()
  sched: Separate group-scheduling code more clearly
  sched: Reorder root_domain to remove 64 bit alignment padding
  sched: Do not attempt to destroy uninitialized rt_bandwidth
  sched: Remove unused function cpu_cfs_rq()
  sched: Fix (harmless) typo 'CONFG_FAIR_GROUP_SCHED'
  sched, cgroup: Optimize load_balance_fair()
  sched: Don't update shares twice on on_rq parent
  sched: update correct entity's runtime in check_preempt_wakeup()
  xtensa: Use generic config PREEMPT definition
  h8300: Use generic config PREEMPT definition
  m32r: Use generic PREEMPT config
  sched: Skip autogroup when looking for all rt sched groups
  sched: Simplify mutex_spin_on_owner()
  sched: Remove rcu_read_lock() from wake_affine()
  sched: Generalize sleep inside spinlock detection
  sched: Make sleeping inside spinlock detection working in !CONFIG_PREEMPT
  sched: Isolate preempt counting in its own config option
  sched: Remove pointless in_atomic() definition check
  ...

1  2 
include/linux/sched.h
kernel/sched.c
lib/Kconfig.debug

Simple merge
diff --cc kernel/sched.c
@@@ -7928,16 -7882,12 +7882,12 @@@ static void init_rt_rq(struct rt_rq *rt
        /* delimiter for bitsearch: */
        __set_bit(MAX_RT_PRIO, array->bitmap);
  
- #if defined CONFIG_SMP || defined CONFIG_RT_GROUP_SCHED
+ #if defined CONFIG_SMP
        rt_rq->highest_prio.curr = MAX_RT_PRIO;
- #ifdef CONFIG_SMP
        rt_rq->highest_prio.next = MAX_RT_PRIO;
- #endif
- #endif
- #ifdef CONFIG_SMP
        rt_rq->rt_nr_migratory = 0;
        rt_rq->overloaded = 0;
 -      plist_head_init_raw(&rt_rq->pushable_tasks, &rq->lock);
 +      plist_head_init(&rt_rq->pushable_tasks);
  #endif
  
        rt_rq->rt_time = 0;
Simple merge