Merge branches 'sched/rt' and 'sched/urgent' into sched/core

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

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

diff --cc init/Kconfig
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/sched_fair.c
index bdf6434,8e1352c,a7e50ba..bc1563e
--- 1/kernel/sched_fair.c
--- 2/kernel/sched_fair.c
--- 3/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@@@ -1440,12 -1393,12 -1411,18 +1458,18 @@@@ static void check_preempt_wakeup(struc
                return;
   
        /*
--       * Batch tasks do not preempt (their preemption is driven by
++       * Batch and idle tasks do not preempt (their preemption is driven by
         * the tick):
         */
--      if (unlikely(p->policy == SCHED_BATCH))
++      if (unlikely(p->policy != SCHED_NORMAL))
 +              return;
 + 
++      /* Idle tasks are by definition preempted by everybody. */
++      if (unlikely(curr->policy == SCHED_IDLE)) {
++              resched_task(curr);
+               return;
++      }
+  
        if (!sched_feat(WAKEUP_PREEMPT))
                return;
   

diff --cc kernel/sched_rt.c
Simple merge