git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'unlikely/sched' of git://git.kernel.org/pub/scm/linux/kernel/git/rosted...
[pandora-kernel.git]
/
kernel
/
sched.c
diff --git
a/kernel/sched.c
b/kernel/sched.c
index
2fe98ed
..
fd18f39
100644
(file)
--- a/
kernel/sched.c
+++ b/
kernel/sched.c
@@
-124,7
+124,7
@@
static inline int rt_policy(int policy)
{
static inline int rt_policy(int policy)
{
- if (
unlikely(policy == SCHED_FIFO || policy == SCHED_RR)
)
+ if (
policy == SCHED_FIFO || policy == SCHED_RR
)
return 1;
return 0;
}
return 1;
return 0;
}
@@
-2486,7
+2486,7
@@
ttwu_do_wakeup(struct rq *rq, struct task_struct *p, int wake_flags)
if (p->sched_class->task_woken)
p->sched_class->task_woken(rq, p);
if (p->sched_class->task_woken)
p->sched_class->task_woken(rq, p);
- if (
unlikely(rq->idle_stamp)
) {
+ if (
rq->idle_stamp
) {
u64 delta = rq->clock - rq->idle_stamp;
u64 max = 2*sysctl_sched_migration_cost;
u64 delta = rq->clock - rq->idle_stamp;
u64 max = 2*sysctl_sched_migration_cost;