From e3efdaf1c3d0491a0d3abcf8e1deaea46298b14c Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Sat, 21 Oct 2006 01:37:39 -0400 Subject: [PATCH] --- yaml --- r: 39640 b: refs/heads/master c: 95625b8f19e1e030c7fe3c010407d90fa248c68f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c | 2 ++ trunk/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e4b644ac35a9..f59f85f67516 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe0f96020d5158b6579548666c842706ce3af371 +refs/heads/master: 95625b8f19e1e030c7fe3c010407d90fa248c68f diff --git a/trunk/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c b/trunk/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c index 23f83531524d..60d20cf427aa 100644 --- a/trunk/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c +++ b/trunk/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/trunk/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c b/trunk/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c index f6afa239d513..d2d9caf00a2f 100644 --- a/trunk/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c +++ b/trunk/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,