From 5a378f0d3d6efcccea7971fb5d4cc583fecfd71c Mon Sep 17 00:00:00 2001 From: Miao Xie Date: Wed, 15 Apr 2009 09:59:10 +0800 Subject: [PATCH] --- yaml --- r: 145707 b: refs/heads/master c: 13318a7186d8e0ae08c996ea4111a945e7789772 h: refs/heads/master i: 145705: 2bc0b27f24e92e67a5f93cdc6c48efaec213b4c8 145703: adc6ccc4c7b295c0c36967b0522ee842c328ce81 v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fa70a7470183..f02e111bfd41 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 78ddb08feb7d4fbe3c0a9931804c51ee58be4023 +refs/heads/master: 13318a7186d8e0ae08c996ea4111a945e7789772 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 92b4b56ad093..7601ceebf7ce 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -7995,7 +7995,7 @@ static void init_numa_sched_groups_power(struct sched_group *group_head) struct sched_domain *sd; sd = &per_cpu(phys_domains, j).sd; - if (j != cpumask_first(sched_group_cpus(sd->groups))) { + if (j != group_first_cpu(sd->groups)) { /* * Only add "power" once for each * physical package. @@ -8073,7 +8073,7 @@ static void init_sched_groups_power(int cpu, struct sched_domain *sd) WARN_ON(!sd || !sd->groups); - if (cpu != cpumask_first(sched_group_cpus(sd->groups))) + if (cpu != group_first_cpu(sd->groups)) return; child = sd->child;