summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorJuri Lelli <juri.lelli@gmail.com>2014-01-14 12:03:51 +0100
committerIngo Molnar <mingo@kernel.org>2014-01-16 09:27:11 +0100
commit71362650b555a5b24c732e455484cc7cac1c8588 (patch)
tree6b5ba45914b56c553e83ccce277e8f963237db20 /kernel
parentd8bf52311ecefd9b11a5af2b28ed7f41c6023516 (diff)
downloadblackbird-op-linux-71362650b555a5b24c732e455484cc7cac1c8588.tar.gz
blackbird-op-linux-71362650b555a5b24c732e455484cc7cac1c8588.zip
sched/deadline: No need to check p if dl_se is valid
Dan Carpenter reported new 'Smatch' warnings: > tree: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core > head: 130816ce4d5f69167324f7272e70aa3d641677c6 > commit: 1baca4ce16b8cc7d4f50be1f7914799af30a2861 [17/50] sched/deadline: Add SCHED_DEADLINE SMP-related data structures & logic > > kernel/sched/deadline.c:937 pick_next_task_dl() warn: variable dereferenced before check 'p' (see line 934) BUG_ON() already fires if pick_next_dl_entity() doesn't return a valid dl_se. No need to check if p is valid afterward. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Juri Lelli <juri.lelli@gmail.com> Signed-off-by: Peter Zijlstra <peterz@infradead.org> Fixes: 1baca4ce16b8 ("sched/deadline: Add SCHED_DEADLINE SMP-related data structures & logic") Link: http://lkml.kernel.org/r/52D54E25.6060100@gmail.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched/deadline.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
index ee25361becdd..0de248202879 100644
--- a/kernel/sched/deadline.c
+++ b/kernel/sched/deadline.c
@@ -1007,8 +1007,7 @@ struct task_struct *pick_next_task_dl(struct rq *rq)
p->se.exec_start = rq_clock_task(rq);
/* Running task will never be pushed. */
- if (p)
- dequeue_pushable_dl_task(rq, p);
+ dequeue_pushable_dl_task(rq, p);
#ifdef CONFIG_SCHED_HRTICK
if (hrtick_enabled(rq))
OpenPOWER on IntegriCloud