[PATCH -next] acpi: get_bios_limit static inline when CPU_FREQ=n

[PATCH -next] acpi: get_bios_limit static inline when CPU_FREQ=n

[Randy Dunlap]

From: Randy Dunlap <randy.dunlap@oracle.com>

For CONFIG_CPU_FREQ=n, make acpi_processor_get_bios_limit()
static inline so that multiple source files that use this
header file do not create multiple definitions of the function.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
 include/acpi/processor.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-next-20091113.orig/include/acpi/processor.h
+++ linux-next-20091113/include/acpi/processor.h
@@ -318,7 +318,7 @@ static inline int acpi_processor_ppc_has
 	}
 	return 0;
 }
-int acpi_processor_get_bios_limit(int cpu, unsigned int *limit)
+static inline int acpi_processor_get_bios_limit(int cpu, unsigned int *limit)
 {
 	return -ENODEV;
 }

[PATCH -next] x86/cpufreq: don't use acpi_processor_get_bios_limit when not available

[Randy Dunlap]

From: Randy Dunlap <randy.dunlap@oracle.com>

Only reference this function when the kconfig makes it available.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
 arch/x86/kernel/cpu/cpufreq/powernow-k7.c |    2 ++
 1 file changed, 2 insertions(+)

--- linux-next-20091113.orig/arch/x86/kernel/cpu/cpufreq/powernow-k7.c
+++ linux-next-20091113/arch/x86/kernel/cpu/cpufreq/powernow-k7.c
@@ -717,7 +717,9 @@ static struct cpufreq_driver powernow_dr
 	.verify		= powernow_verify,
 	.target		= powernow_target,
 	.get		= powernow_get,
+#ifdef CONFIG_X86_POWERNOW_K7_ACPI
 	.bios_limit	= acpi_processor_get_bios_limit,
+#endif
 	.init		= powernow_cpu_init,
 	.exit		= powernow_cpu_exit,
 	.name		= "powernow-k7",