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

Pull scheduler changes from Ingo Molnar:
 "The main changes in this cycle are:

   - (much) improved CONFIG_NUMA_BALANCING support from Mel Gorman, Rik
     van Riel, Peter Zijlstra et al.  Yay!

   - optimize preemption counter handling: merge the NEED_RESCHED flag
     into the preempt_count variable, by Peter Zijlstra.

   - wait.h fixes and code reorganization from Peter Zijlstra

   - cfs_bandwidth fixes from Ben Segall

   - SMP load-balancer cleanups from Peter Zijstra

   - idle balancer improvements from Jason Low

   - other fixes and cleanups"

* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (129 commits)
  ftrace, sched: Add TRACE_FLAG_PREEMPT_RESCHED
  stop_machine: Fix race between stop_two_cpus() and stop_cpus()
  sched: Remove unnecessary iteration over sched domains to update nr_busy_cpus
  sched: Fix asymmetric scheduling for POWER7
  sched: Move completion code from core.c to completion.c
  sched: Move wait code from core.c to wait.c
  sched: Move wait.c into kernel/sched/
  sched/wait: Fix __wait_event_interruptible_lock_irq_timeout()
  sched: Avoid throttle_cfs_rq() racing with period_timer stopping
  sched: Guarantee new group-entities always have weight
  sched: Fix hrtimer_cancel()/rq->lock deadlock
  sched: Fix cfs_bandwidth misuse of hrtimer_expires_remaining
  sched: Fix race on toggling cfs_bandwidth_used
  sched: Remove extra put_online_cpus() inside sched_setaffinity()
  sched/rt: Fix task_tick_rt() comment
  sched/wait: Fix build breakage
  sched/wait: Introduce prepare_to_wait_event()
  sched/wait: Add ___wait_cond_timeout() to wait_event*_timeout() too
  sched: Remove get_online_cpus() usage
  sched: Fix race in migrate_swap_stop()
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/kernel/entry_64.S
Simple merge

diff --cc arch/x86/kernel/irq_32.c
Simple merge

diff --cc include/linux/tty.h
Simple merge

diff --cc kernel/Makefile
index f99d908b5550766817d22ec0406f5776599044af,b3d51e229356db26978e2244053ba93ebf686c3c..a4d1aa8da9bc7180ad279a709e4d22cc5627543d
--- 1/kernel/Makefile
--- 2/kernel/Makefile
+++ b/kernel/Makefile
@@@ -6,9 -6,9 +6,9 @@@ obj-y     = fork.o exec_domain.o panic.
            cpu.o exit.o itimer.o time.o softirq.o resource.o \
            sysctl.o sysctl_binary.o capability.o ptrace.o timer.o user.o \
            signal.o sys.o kmod.o workqueue.o pid.o task_work.o \
 -          rcupdate.o extable.o params.o posix-timers.o \
 +          extable.o params.o posix-timers.o \
-           kthread.o wait.o sys_ni.o posix-cpu-timers.o mutex.o \
+           kthread.o sys_ni.o posix-cpu-timers.o mutex.o \
 -          hrtimer.o rwsem.o nsproxy.o srcu.o semaphore.o \
 +          hrtimer.o rwsem.o nsproxy.o semaphore.o \
            notifier.o ksysfs.o cred.o reboot.o \
            async.o range.o groups.o lglock.o smpboot.o
  

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/rcu/tree.c
Simple merge

diff --cc kernel/softirq.c
index dacd0ab51df4b782815dd61326f4e8512e25ddf2,dcab1d3fb53d284cc42da1e36c6e5d001cd5baa9..b24988353458c8cad2fff6aed7853f8625f1cf36
--- 1/kernel/softirq.c
--- 2/kernel/softirq.c
+++ b/kernel/softirq.c
@@@ -168,17 -169,12 +168,17 @@@ static inline void _local_bh_enable_ip(
         * Keep preemption disabled until we are done with
         * softirq processing:
         */
-       sub_preempt_count(SOFTIRQ_DISABLE_OFFSET - 1);
+       preempt_count_sub(SOFTIRQ_DISABLE_OFFSET - 1);
  
 -      if (unlikely(!in_interrupt() && local_softirq_pending()))
 +      if (unlikely(!in_interrupt() && local_softirq_pending())) {
 +              /*
 +               * Run softirq if any pending. And do it in its own stack
 +               * as we may be calling this deep in a task call stack already.
 +               */
                do_softirq();
 +      }
  
-       dec_preempt_count();
+       preempt_count_dec();
  #ifdef CONFIG_TRACE_IRQFLAGS
        local_irq_enable();
  #endif

diff --cc kernel/sysctl.c
Simple merge