From: Dave Jones <davej@redhat.com>
Date: Sat, 21 Oct 2006 05:37:39 +0000 (-0400)
Subject: [CPUFREQ] ifdef more unused on !SMP code.
X-Git-Tag: v2.6.20-rc1~160
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95625b8f19e1e030c7fe3c010407d90fa248c68f;p=linux-2.6

[CPUFREQ] ifdef more unused on !SMP code.

acpi-cpufreq needs the same patch as the previous speedstep-centrino change.
Additionally, the centrino driver can have its ifdef moved out a little
further to eliminate some more code/variables.

Signed-off-by: Dave Jones <davej@redhat.com>
---

diff --git a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
index 23f8353152..60d20cf427 100644
--- a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -554,6 +554,7 @@ static int acpi_cpufreq_early_init(void)
 	return 0;
 }
 
+#ifdef CONFIG_SMP
 /*
  * Some BIOSes do SW_ANY coordination internally, either set it up in hw
  * or do it in BIOS firmware and won't inform about it to OS. If not
@@ -580,6 +581,7 @@ static struct dmi_system_id sw_any_bug_dmi_table[] = {
 	},
 	{ }
 };
+#endif
 
 static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
 {
diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c b/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
index f6afa239d5..d2d9caf00a 100644
--- a/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
+++ b/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
@@ -379,6 +379,7 @@ static int centrino_cpu_early_init_acpi(void)
 }
 
 
+#ifdef CONFIG_SMP
 /*
  * Some BIOSes do SW_ANY coordination internally, either set it up in hw
  * or do it in BIOS firmware and won't inform about it to OS. If not
@@ -392,7 +393,6 @@ static int sw_any_bug_found(struct dmi_system_id *d)
 	return 0;
 }
 
-#ifdef CONFIG_SMP
 static struct dmi_system_id sw_any_bug_dmi_table[] = {
 	{
 		.callback = sw_any_bug_found,