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

Pull scheduler fixes from Ingo Molnar:
 "Four misc fixes: each was deemed serious enough to warrant v3.15
  inclusion"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/fair: Fix tg_set_cfs_bandwidth() deadlock on rq->lock
  sched/dl: Fix race in dl_task_timer()
  sched: Fix sched_policy < 0 comparison
  sched/numa: Fix use of spin_{un}lock_irq() when interrupts are disabled

1 files changed, 2 insertions, 3 deletions

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 0a7251678982..084d17f89139 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -3685,7 +3685,7 @@ SYSCALL_DEFINE3(sched_setattr, pid_t, pid, struct sched_attr __user *, uattr,
         if (retval)
                 return retval;
 
-        if (attr.sched_policy < 0)
+        if ((int)attr.sched_policy < 0)
                 return -EINVAL;
 
         rcu_read_lock();
@@ -7751,8 +7751,7 @@ static int tg_set_cfs_bandwidth(struct task_group *tg, u64 period, u64 quota)
         /* restart the period timer (if active) to handle new period expiry */
         if (runtime_enabled && cfs_b->timer_active) {
                 /* force a reprogram */
-                cfs_b->timer_active = 0;
-                __start_cfs_bandwidth(cfs_b);
+                __start_cfs_bandwidth(cfs_b, true);
         }
         raw_spin_unlock_irq(&cfs_b->lock);