• Linus Torvalds's avatar
    Merge branch 'sched-core-for-linus' of... · f66ffded
    Linus Torvalds authored
    Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (25 commits)
      sched: Fix SCHED_MC regression caused by change in sched cpu_power
      sched: Don't use possibly stale sched_class
      kthread, sched: Remove reference to kthread_create_on_cpu
      sched: cpuacct: Use bigger percpu counter batch values for stats counters
      percpu_counter: Make __percpu_counter_add an inline function on UP
      sched: Remove member rt_se from struct rt_rq
      sched: Change usage of rt_rq->rt_se to rt_rq->tg->rt_se[cpu]
      sched: Remove unused update_shares_locked()
      sched: Use for_each_bit
      sched: Queue a deboosted task to the head of the RT prio queue
      sched: Implement head queueing for sched_rt
      sched: Extend enqueue_task to allow head queueing
      sched: Remove USER_SCHED
      sched: Fix the place where group powers are updated
      sched: Assume *balance is valid
      sched: Remove load_balance_newidle()
      sched: Unify load_balance{,_newidle}()
      sched: Add a lock break for PREEMPT=y
      sched: Remove from fwd decls
      sched: Remove rq_iterator from move_one_task
      ...
    
    Fix up trivial conflicts in kernel/sched.c
    f66ffded
sched.c 219 KB