aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/sched.c4
-rw-r--r--kernel/sched_rt.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 2fe98ed474d..fd18f395a1b 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -124,7 +124,7 @@
124 124
125static inline int rt_policy(int policy) 125static inline int rt_policy(int policy)
126{ 126{
127 if (unlikely(policy == SCHED_FIFO || policy == SCHED_RR)) 127 if (policy == SCHED_FIFO || policy == SCHED_RR)
128 return 1; 128 return 1;
129 return 0; 129 return 0;
130} 130}
@@ -2486,7 +2486,7 @@ ttwu_do_wakeup(struct rq *rq, struct task_struct *p, int wake_flags)
2486 if (p->sched_class->task_woken) 2486 if (p->sched_class->task_woken)
2487 p->sched_class->task_woken(rq, p); 2487 p->sched_class->task_woken(rq, p);
2488 2488
2489 if (unlikely(rq->idle_stamp)) { 2489 if (rq->idle_stamp) {
2490 u64 delta = rq->clock - rq->idle_stamp; 2490 u64 delta = rq->clock - rq->idle_stamp;
2491 u64 max = 2*sysctl_sched_migration_cost; 2491 u64 max = 2*sysctl_sched_migration_cost;
2492 2492
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c
index 88725c939e0..08e937496b2 100644
--- a/kernel/sched_rt.c
+++ b/kernel/sched_rt.c
@@ -1126,7 +1126,7 @@ static struct task_struct *_pick_next_task_rt(struct rq *rq)
1126 1126
1127 rt_rq = &rq->rt; 1127 rt_rq = &rq->rt;
1128 1128
1129 if (unlikely(!rt_rq->rt_nr_running)) 1129 if (!rt_rq->rt_nr_running)
1130 return NULL; 1130 return NULL;
1131 1131
1132 if (rt_rq_throttled(rt_rq)) 1132 if (rt_rq_throttled(rt_rq))
@@ -1544,7 +1544,7 @@ skip:
1544static void pre_schedule_rt(struct rq *rq, struct task_struct *prev) 1544static void pre_schedule_rt(struct rq *rq, struct task_struct *prev)
1545{ 1545{
1546 /* Try to pull RT tasks here if we lower this rq's prio */ 1546 /* Try to pull RT tasks here if we lower this rq's prio */
1547 if (unlikely(rt_task(prev)) && rq->rt.highest_prio.curr > prev->prio) 1547 if (rq->rt.highest_prio.curr > prev->prio)
1548 pull_rt_task(rq); 1548 pull_rt_task(rq);
1549} 1549}
1550 1550