lkml.org 
[lkml]   [2008]   [Aug]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patches in this message
/
Date
From
SubjectRe: [PATCH -next] powernow-k8: fix build errors
On Fri, 8 Aug 2008 13:38:22 -0400 Dave Jones wrote:

> I think something like below may be better..
> Same thing, but with one less ifdef ?

Close, but no cigar.

> diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
> index 7a09ba4..3ba6fd2 100644
> --- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
> +++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
> @@ -951,6 +951,7 @@ static void powernow_k8_cpu_exit_acpi(struct powernow_k8_data *data)
> }
>
> #else
> +static int powernow_k8_cpu_preinit_acpi(struct powernow_k8_data *data) { return -ENODEV; }

(void) // parameters

> static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data) { return -ENODEV; }
> static void powernow_k8_cpu_exit_acpi(struct powernow_k8_data *data) { return; }
> static void powernow_k8_acpi_pst_values(struct powernow_k8_data *data, unsigned int index) { return; }
> @@ -1349,7 +1351,9 @@ static void __exit powernowk8_exit(void)
> dprintk("exit\n");
>
> cpufreq_unregister_driver(&cpufreq_amd64_driver);
>
> +#ifdef CONFIG_X86_POWERNOW_K8_ACPI
> free_percpu(acpi_perf_data);
> +#ifdef

#endif

> }
>
> MODULE_AUTHOR("Paul Devriendt <paul.devriendt@amd.com> and Mark Langsdorf <mark.langsdorf@amd.com>");


---
(your) new patch:
---
arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 3 +++
1 file changed, 3 insertions(+)
--- linux-next-20080808.orig/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
+++ linux-next-20080808/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
@@ -951,6 +951,7 @@ static void powernow_k8_cpu_exit_acpi(st
}

#else
+static int powernow_k8_cpu_preinit_acpi(void) { return -ENODEV; }
static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data) { return -ENODEV; }
static void powernow_k8_cpu_exit_acpi(struct powernow_k8_data *data) { return; }
static void powernow_k8_acpi_pst_values(struct powernow_k8_data *data, unsigned int index) { return; }
@@ -1349,7 +1350,9 @@ static void __exit powernowk8_exit(void)

cpufreq_unregister_driver(&cpufreq_amd64_driver);

+#ifdef CONFIG_X86_POWERNOW_K8_ACPI
free_percpu(acpi_perf_data);
+#endif
}

MODULE_AUTHOR("Paul Devriendt <paul.devriendt@amd.com> and Mark Langsdorf <mark.langsdorf@amd.com>");

\
 
 \ /
  Last update: 2008-08-08 19:53    [W:1.145 / U:0.004 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site