Merge branch 'linus' into sched/devel

diff --cc kernel/sched.c
index e1299de1765eede3d3aa28db58be80b3466793e5,ad1962dc0aa20cb865675e8e08e49f5b49bce1df..2caedc47e764d1bf24aa96bf6d784250681c0a98
--- 1/kernel/sched.c
--- 2/kernel/sched.c
+++ b/kernel/sched.c
@@@ -201,14 -201,9 +201,14 @@@ void init_rt_bandwidth(struct rt_bandwi
        hrtimer_init(&rt_b->rt_period_timer,
                        CLOCK_MONOTONIC, HRTIMER_MODE_REL);
        rt_b->rt_period_timer.function = sched_rt_period_timer;
-       rt_b->rt_period_timer.cb_mode = HRTIMER_CB_IRQSAFE_NO_SOFTIRQ;
+       rt_b->rt_period_timer.cb_mode = HRTIMER_CB_IRQSAFE_UNLOCKED;
  }
  
 +static inline int rt_bandwidth_enabled(void)
 +{
 +      return sysctl_sched_rt_runtime >= 0;
 +}
 +
  static void start_rt_bandwidth(struct rt_bandwidth *rt_b)
  {
        ktime_t now;
@@@ -1124,9 -1119,9 +1124,9 @@@ static void init_rq_hrtick(struct rq *r
  
        hrtimer_init(&rq->hrtick_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
        rq->hrtick_timer.function = hrtick;
-       rq->hrtick_timer.cb_mode = HRTIMER_CB_IRQSAFE_NO_SOFTIRQ;
+       rq->hrtick_timer.cb_mode = HRTIMER_CB_IRQSAFE_PERCPU;
  }
 -#else
 +#else /* CONFIG_SCHED_HRTICK */
  static inline void hrtick_clear(struct rq *rq)
  {
  }