Commit e197f094b7da7d94812492cfcd706d143f1020e5
Exists in
master
and in
6 other branches
Merge branch 'unlikely/sched' of git://git.kernel.org/pub/scm/linux/kernel/git/r…
…ostedt/linux-2.6-trace into sched/urgent
Showing 2 changed files Side-by-side Diff
kernel/sched.c
| ... | ... | @@ -124,7 +124,7 @@ |
| 124 | 124 | |
| 125 | 125 | static 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 | 128 | return 1; |
| 129 | 129 | return 0; |
| 130 | 130 | } |
| ... | ... | @@ -2486,7 +2486,7 @@ |
| 2486 | 2486 | if (p->sched_class->task_woken) |
| 2487 | 2487 | p->sched_class->task_woken(rq, p); |
| 2488 | 2488 | |
| 2489 | - if (unlikely(rq->idle_stamp)) { | |
| 2489 | + if (rq->idle_stamp) { | |
| 2490 | 2490 | u64 delta = rq->clock - rq->idle_stamp; |
| 2491 | 2491 | u64 max = 2*sysctl_sched_migration_cost; |
| 2492 | 2492 |
kernel/sched_rt.c
| ... | ... | @@ -1126,7 +1126,7 @@ |
| 1126 | 1126 | |
| 1127 | 1127 | rt_rq = &rq->rt; |
| 1128 | 1128 | |
| 1129 | - if (unlikely(!rt_rq->rt_nr_running)) | |
| 1129 | + if (!rt_rq->rt_nr_running) | |
| 1130 | 1130 | return NULL; |
| 1131 | 1131 | |
| 1132 | 1132 | if (rt_rq_throttled(rt_rq)) |
| ... | ... | @@ -1544,7 +1544,7 @@ |
| 1544 | 1544 | static void pre_schedule_rt(struct rq *rq, struct task_struct *prev) |
| 1545 | 1545 | { |
| 1546 | 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 | 1548 | pull_rt_task(rq); |
| 1549 | 1549 | } |
| 1550 | 1550 |