Skip to contentSkip to conversation

fix cpufreq_p4_get for new cpu_sibling_mask

PATCH New Dominik Brodowski 1 participant 1 message May 11, 2004

lore
Share & tools
lore

Dominik Brodowski

author
#0 lore raw

PATCH 1/1 fix cpufreq_p4_get for new cpu_sibling_mask

Update the newly added cpufreq_p4_get for the change of cpu_sibling_mask to cpumask_t in 2.6.6-bk-latest.

 arch/i386/kernel/cpu/cpufreq/p4-clockmod.c |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)
arch/i386/kernel/cpu/cpufreq/p4-clockmod.c +4 -10
diff -ruN linux-original/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c linux/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
@@ -268,21 +268,15 @@
 
 static unsigned int cpufreq_p4_get(unsigned int cpu)
 {
-	unsigned int hyperthreading;
 	cpumask_t cpus_allowed, affected_cpu_map;
 	u32 l, h;
 
-	hyperthreading = 0;
-
 	/* only run on CPU to be set, or on its sibling */
 	cpus_allowed = current->cpus_allowed;
-	affected_cpu_map = cpumask_of_cpu(cpu);
-#ifdef CONFIG_X86_HT
-	hyperthreading = ((cpu_has_ht) && (smp_num_siblings == 2));
-	if (hyperthreading) {
-		sibling = cpu_sibling_map[cpu];
-		cpu_set(sibling, affected_cpu_map);
-	}
+#ifdef CONFIG_SMP
+        affected_cpu_map = cpu_sibling_map[cpu];
+#else
+        affected_cpu_map = cpumask_of_cpu(cpu);
 #endif
 	set_cpus_allowed(current, affected_cpu_map);
         BUG_ON(!cpu_isset(smp_processor_id(), affected_cpu_map));