| Message ID | 20040603121704.GB8164@gondor.apana.org.au |
|---|---|
| State | New, archived |
| Headers | show |
| Series |
|
| Related | show |
On Thu, Jun 03, 2004 at 10:17:04PM +1000, Herbert Xu wrote: > Hi: > > The last round of updates to powernow-k7.c broke it when > CONFIG_ACPI_PROCESSOR is built as a module. This patch > fixes that. How strange, I could swear I already merged this patch into the last round that went to Linus. I'll make sure it gets into the next one. There's been some corruption with the cpufreq -bk tree the last few days which has only just got fixed up, so I'm a little behind on cpufreq patches. Dave - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
* Dave Jones <davej@redhat.com> [040603 05:38]: > On Thu, Jun 03, 2004 at 10:17:04PM +1000, Herbert Xu wrote: > > Hi: > > > > The last round of updates to powernow-k7.c broke it when > > CONFIG_ACPI_PROCESSOR is built as a module. This patch > > fixes that. > > How strange, I could swear I already merged this patch into > the last round that went to Linus. I'll make sure it gets > into the next one. There's been some corruption with the > cpufreq -bk tree the last few days which has only just got > fixed up, so I'm a little behind on cpufreq patches. The Deja Vu was the same patch for powernow-k8. Regards, Tony - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
===== arch/i386/kernel/cpu/cpufreq/powernow-k7.c 1.51 vs edited ===== --- 1.51/arch/i386/kernel/cpu/cpufreq/powernow-k7.c 2004-05-08 00:34:07 +10:00 +++ edited/arch/i386/kernel/cpu/cpufreq/powernow-k7.c 2004-06-03 22:11:08 +10:00 @@ -28,7 +28,7 @@ #include <asm/io.h> #include <asm/system.h> -#ifdef CONFIG_ACPI_PROCESSOR +#if defined(CONFIG_ACPI_PROCESSOR) || defined(CONFIG_ACPI_PROCESSOR_MODULE) #include <linux/acpi.h> #include <acpi/processor.h> #endif @@ -63,7 +63,7 @@ u8 numpstates; }; -#ifdef CONFIG_ACPI_PROCESSOR +#if defined(CONFIG_ACPI_PROCESSOR) || defined(CONFIG_ACPI_PROCESSOR_MODULE) union powernow_acpi_control_t { struct { unsigned long fid:5, @@ -293,7 +293,7 @@ } -#ifdef CONFIG_ACPI_PROCESSOR +#if defined(CONFIG_ACPI_PROCESSOR) || defined(CONFIG_ACPI_PROCESSOR_MODULE) struct acpi_processor_performance *acpi_processor_perf; @@ -642,7 +642,7 @@ static void __exit powernow_exit (void) { -#ifdef CONFIG_ACPI_PROCESSOR +#if defined(CONFIG_ACPI_PROCESSOR) || defined(CONFIG_ACPI_PROCESSOR_MODULE) if (acpi_processor_perf) { acpi_processor_unregister_performance(acpi_processor_perf, 0); kfree(acpi_processor_perf);