Re: 2.6.6-mm1

[Dave Jones <davej@redhat.com>]

On Mon, May 10, 2004 at 12:52:33PM +0200, Dominik Karall wrote:
 > 
 >   CC      arch/i386/kernel/cpu/cpufreq/p4-clockmod.o
 > arch/i386/kernel/cpu/cpufreq/p4-clockmod.c: In Funktion >>cpufreq_p4_get<<:
 > arch/i386/kernel/cpu/cpufreq/p4-clockmod.c:283: error: `sibling' undeclared 
 > (first use in this function)
 > arch/i386/kernel/cpu/cpufreq/p4-clockmod.c:283: error: (Each undeclared 
 > identifier is reported only once
 > arch/i386/kernel/cpu/cpufreq/p4-clockmod.c:283: error: for each function it 
 > appears in.)
 > make[4]: *** [arch/i386/kernel/cpu/cpufreq/p4-clockmod.o] Fehler 1

Oops.

		Dave

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/05/10 12:17:30+01:00 davej@redhat.com 
#   [CPUFREQ] Compilation fix.
# 
# arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
#   2004/05/10 12:17:25+01:00 davej@redhat.com +3 -2
#   [CPUFREQ] Compilation fix.
# 
diff -Nru a/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c b/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
--- a/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c	Mon May 10 12:18:08 2004
+++ b/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c	Mon May 10 12:18:08 2004
@@ -74,7 +74,7 @@
 	hyperthreading = ((cpu_has_ht) && (smp_num_siblings == 2));
 	if (hyperthreading) {
 		sibling = cpu_sibling_map[cpu];
-                cpu_set(sibling, affected_cpu_map);
+		cpu_set(sibling, affected_cpu_map);
 	}
 #endif
 	set_cpus_allowed(current, affected_cpu_map);
@@ -283,12 +283,13 @@
 #ifdef CONFIG_X86_HT
 	hyperthreading = ((cpu_has_ht) && (smp_num_siblings == 2));
 	if (hyperthreading) {
+		int sibling;
 		sibling = cpu_sibling_map[cpu];
 		cpu_set(sibling, affected_cpu_map);
 	}
 #endif
 	set_cpus_allowed(current, affected_cpu_map);
-        BUG_ON(!cpu_isset(smp_processor_id(), affected_cpu_map));
+	BUG_ON(!cpu_isset(smp_processor_id(), affected_cpu_map));
 
 	rdmsr(MSR_IA32_THERM_CONTROL, l, h);