summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2010-12-06 14:48:10 -0500
committerSteven Rostedt <rostedt@goodmis.org>2010-12-13 19:56:40 -0500
commit63f01241176d7cbc976385aec32f0a209b0bc36a (patch)
treef09c81454139ff3364b69f185d52cd82ffa203a1 /kernel
parent8e54a2c036d8c47195f094af1628834f4c55844a (diff)
downloadlinux-stable-63f01241176d7cbc976385aec32f0a209b0bc36a.tar.gz
linux-stable-63f01241176d7cbc976385aec32f0a209b0bc36a.tar.bz2
linux-stable-63f01241176d7cbc976385aec32f0a209b0bc36a.zip
sched: Remove unlikely() from rt_policy() in sched.c
The rt_policy() has an unlikely() that the policy it is checking is of RT priority (SCHED_FIFO or SCHED_RR). According to the annotate branch profiler it is incorrect most of the time: correct incorrect % Function File Line ------- --------- - -------- ---- ---- 36667 654674 94 rt_policy sched.c 126 This makes sense because the rt_policy() is used by the sched_set_scheduler() and nice(). Although users may use sys_nice a bit, all RT users use the sched_set_scheduler() to set their RT priority, including kernel threads. The above numbers were from a normal desktop computer running firefox, evolution, xchat and was part of a distcc compile farm. Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index dc91a4d09ac3..269a0450281c 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -123,7 +123,7 @@
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;
}