bpf: restrict unknown scalars of mixed signed bounds for unprivileged

[linux-2.6-microblaze.git] / kernel / sched / rt.c

diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
index a21ea60..e4f398a 100644 (file)
--- a/kernel/sched/rt.c
+++ b/kernel/sched/rt.c
@@ -1498,6 +1498,14 @@ static void check_preempt_curr_rt(struct rq *rq, struct task_struct *p, int flag
 #endif
 }
 
+static inline void set_next_task(struct rq *rq, struct task_struct *p)
+{
+       p->se.exec_start = rq_clock_task(rq);
+
+       /* The running task is never eligible for pushing */
+       dequeue_pushable_task(rq, p);
+}
+
 static struct sched_rt_entity *pick_next_rt_entity(struct rq *rq,
                                                   struct rt_rq *rt_rq)
 {
@@ -1518,7 +1526,6 @@ static struct sched_rt_entity *pick_next_rt_entity(struct rq *rq,
 static struct task_struct *_pick_next_task_rt(struct rq *rq)
 {
        struct sched_rt_entity *rt_se;
-       struct task_struct *p;
        struct rt_rq *rt_rq  = &rq->rt;
 
        do {
@@ -1527,10 +1534,7 @@ static struct task_struct *_pick_next_task_rt(struct rq *rq)
                rt_rq = group_rt_rq(rt_se);
        } while (rt_rq);
 
-       p = rt_task_of(rt_se);
-       p->se.exec_start = rq_clock_task(rq);
-
-       return p;
+       return rt_task_of(rt_se);
 }
 
 static struct task_struct *
@@ -1573,8 +1577,7 @@ pick_next_task_rt(struct rq *rq, struct task_struct *prev, struct rq_flags *rf)
 
        p = _pick_next_task_rt(rq);
 
-       /* The running task is never eligible for pushing */
-       dequeue_pushable_task(rq, p);
+       set_next_task(rq, p);
 
        rt_queue_push_tasks(rq);
 
@@ -1810,10 +1813,8 @@ static int push_rt_task(struct rq *rq)
                return 0;
 
 retry:
-       if (unlikely(next_task == rq->curr)) {
-               WARN_ON(1);
+       if (WARN_ON(next_task == rq->curr))
                return 0;
-       }
 
        /*
         * It's possible that the next_task slipped in of
@@ -2355,12 +2356,7 @@ static void task_tick_rt(struct rq *rq, struct task_struct *p, int queued)
 
 static void set_curr_task_rt(struct rq *rq)
 {
-       struct task_struct *p = rq->curr;
-
-       p->se.exec_start = rq_clock_task(rq);
-
-       /* The running task is never eligible for pushing */
-       dequeue_pushable_task(rq, p);
+       set_next_task(rq, rq->curr);
 }
 
 static unsigned int get_rr_interval_rt(struct rq *rq, struct task_struct *task)