Commit 71362650 authored Jan 14, 2014 by Juri Lelli Committed by Ingo Molnar Jan 16, 2014

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:   130816ce
  > commit: 1baca4ce [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: 1baca4ce ("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>

parent d8bf5231

kernel/sched/deadline.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1007,7 +1007,6 @@ struct task_struct pick_next_task_dl(struct rq rq)
	p->se.exec_start = rq_clock_task(rq);		p->se.exec_start = rq_clock_task(rq);

	/* Running task will never be pushed. */		/* Running task will never be pushed. */
	if (p)
	dequeue_pushable_dl_task(rq, p);		dequeue_pushable_dl_task(rq, p);

	#ifdef CONFIG_SCHED_HRTICK		#ifdef CONFIG_SCHED_HRTICK