From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 12 Nov 2013 01:20:12 +0000 (+0900)
Subject: Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.13-rc1~148
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=39cf275a1a18ba3c7eb9b986c5c9b35b57332798;p=thirdparty%2Fkernel%2Flinux.git

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

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()
  ...
---

39cf275a1a18ba3c7eb9b986c5c9b35b57332798
diff --cc kernel/Makefile
index f99d908b55507,b3d51e229356d..a4d1aa8da9bc7
--- a/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/softirq.c
index dacd0ab51df4b,dcab1d3fb53d2..b24988353458c
--- a/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