[PATCH 03/12] ACPI: processor: export acpi_get_cpuid()

Alex Chiang
2010-01-25T21:43:34Z

Rename static get_cpu_id() to acpi_get_cpuid() and export it.

This change also gives us an opportunity to remove the
#ifndef CONFIG_SMP from processor_driver.c and into a header file
where it properly belongs.

Cc: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Alex Chiang <achiang@hp.com>
---

drivers/acpi/processor_driver.c | 10 ++++------
include/acpi/processor.h | 8 ++++++++
2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index d2f285b..404fab4 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -359,10 +359,7 @@ static inline int acpi_processor_remove_fs(struct acpi_device *device)

/* Use the acpiid in MADT to map cpus in case of SMP */

-#ifndef CONFIG_SMP
-static int get_cpu_id(acpi_handle handle, int type, u32 acpi_id) { return -1; }
-#else
-
+#ifdef CONFIG_SMP
static struct acpi_table_madt *madt;

static int map_lapic_id(struct acpi_subtable_header *entry,
@@ -494,7 +491,7 @@ exit:
return apic_id;
}

-static int get_cpu_id(acpi_handle handle, int type, u32 acpi_id)
+int acpi_get_cpuid(acpi_handle handle, int type, u32 acpi_id)
{
int i;
int apic_id = -1;
@@ -511,6 +508,7 @@ static int get_cpu_id(acpi_handle handle, int type, u32 acpi_id)
}
return -1;
}
+EXPORT_SYMBOL_GPL(acpi_get_cpuid);
#endif

/* --------------------------------------------------------------------------
@@ -577,7 +575,7 @@ static int acpi_processor_get_info(struct acpi_device *device)
device_declaration = 1;
pr->acpi_id = value;
}
- cpu_index = get_cpu_id(pr->handle, device_declaration, pr->acpi_id);
+ cpu_index = acpi_get_cpuid(pr->handle, device_declaration, pr->acpi_id);

/* Handle UP system running SMP kernel, with no LAPIC in MADT */
if (!cpu0_initialized && (cpu_index == -1) &&
diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index d767006..3b66978 100644
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -322,6 +322,14 @@ static inline int acpi_processor_get_bios_limit(int cpu, unsigned int *limit)

/* in processor_core.c */
void acpi_processor_set_pdc(acpi_handle handle);
+#ifdef CONFIG_SMP
+int acpi_get_cpuid(acpi_handle, int type, u32 acpi_id);
+#else
+static inline int acpi_get_cpuid(acpi_handle handle, int type, u32 acpi_id)
+{
+ return -1;
+}
+#endif

/* in processor_throttling.c */
int acpi_processor_tstate_has_changed(struct acpi_processor *pr);