[3/3] sched: remove WARN_ON(!sd) from init_sched_groups_power()

Message ID 2bbe633cd74b431c05253a8ce61fdfd5066a531b.1370948150.git.viresh.kumar@linaro.org
State Accepted
Headers show

Commit Message

Viresh Kumar June 11, 2013, 11:02 a.m.
sd can't be NULL in init_sched_groups_power() and so checking it for NULL isn't
useful. In case it is required, then also we need to rearrange the code a bit as
we already accessed invalid pointer sd to get sg: sg = sd->groups.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
 kernel/sched/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Peter Zijlstra June 18, 2013, 10:03 a.m. | #1
On Tue, Jun 11, 2013 at 04:32:45PM +0530, Viresh Kumar wrote:
> sd can't be NULL in init_sched_groups_power() and so checking it for NULL isn't
> useful. In case it is required, then also we need to rearrange the code a bit as
> we already accessed invalid pointer sd to get sg: sg = sd->groups.
> 

Err on the side of paranoia :-)

Patch

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 27842f5..c949f6d 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -5387,7 +5387,7 @@  static void init_sched_groups_power(int cpu, struct sched_domain *sd)
 {
 	struct sched_group *sg = sd->groups;
 
-	WARN_ON(!sd || !sg);
+	WARN_ON(!sg);
 
 	do {
 		sg->group_weight = cpumask_weight(sched_group_cpus(sg));