From: Andrew Morton Cc: Suresh Siddha Cc: Ingo Molnar Signed-off-by: Andrew Morton --- kernel/sched.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff -puN kernel/sched.c~sched-new-sched-domain-for-representing-multi-core-fix kernel/sched.c --- 25/kernel/sched.c~sched-new-sched-domain-for-representing-multi-core-fix Tue Jan 31 17:15:14 2006 +++ 25-akpm/kernel/sched.c Tue Jan 31 17:15:14 2006 @@ -5691,12 +5691,12 @@ static DEFINE_PER_CPU(struct sched_domai static struct sched_group sched_group_core[NR_CPUS]; #endif -#if defined(CONFIG_SCHED_MC) && defined(CONFIG_SCHED_MT) +#if defined(CONFIG_SCHED_MC) && defined(CONFIG_SCHED_SMT) static int cpu_to_core_group(int cpu) { return first_cpu(cpu_sibling_map[cpu]); } -#elif defined(CONFIG_SCHED_MC) +#elif defined(CONFIG_SCHED_MC) static int cpu_to_core_group(int cpu) { return cpu; @@ -5707,10 +5707,10 @@ static DEFINE_PER_CPU(struct sched_domai static struct sched_group sched_group_phys[NR_CPUS]; static int cpu_to_phys_group(int cpu) { -#if defined(CONFIG_SCHED_MC) +#if defined(CONFIG_SCHED_MC) cpumask_t mask = cpu_coregroup_map(cpu); return first_cpu(mask); -#elif defined(CONFIG_SCHED_MT) +#elif defined(CONFIG_SCHED_SMT) return first_cpu(cpu_sibling_map[cpu]); #else return cpu; _