diff options
author | Alex Chiang <achiang@hp.com> | 2010-02-22 14:11:19 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2010-03-14 21:17:18 -0400 |
commit | 2e9d5e4efa0beeca03ad550bda28027826e83e42 (patch) | |
tree | 2b2c94819ff1b521933ab7fec8d430e2ce3ee91b /drivers/acpi | |
parent | 4d5d4cd88c542ff56cf7feacd29cc907f2abbfbb (diff) |
ACPI: processor: export acpi_get_cpuid()
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.
Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Alex Chiang <achiang@hp.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/processor_driver.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c index 7b0f4c2a06e8..98358251ce23 100644 --- a/drivers/acpi/processor_driver.c +++ b/drivers/acpi/processor_driver.c | |||
@@ -361,10 +361,7 @@ static inline int acpi_processor_remove_fs(struct acpi_device *device) | |||
361 | 361 | ||
362 | /* Use the acpiid in MADT to map cpus in case of SMP */ | 362 | /* Use the acpiid in MADT to map cpus in case of SMP */ |
363 | 363 | ||
364 | #ifndef CONFIG_SMP | 364 | #ifdef CONFIG_SMP |
365 | static int get_cpu_id(acpi_handle handle, int type, u32 acpi_id) { return -1; } | ||
366 | #else | ||
367 | |||
368 | static struct acpi_table_madt *madt; | 365 | static struct acpi_table_madt *madt; |
369 | 366 | ||
370 | static int map_lapic_id(struct acpi_subtable_header *entry, | 367 | static int map_lapic_id(struct acpi_subtable_header *entry, |
@@ -496,7 +493,7 @@ exit: | |||
496 | return apic_id; | 493 | return apic_id; |
497 | } | 494 | } |
498 | 495 | ||
499 | static int get_cpu_id(acpi_handle handle, int type, u32 acpi_id) | 496 | int acpi_get_cpuid(acpi_handle handle, int type, u32 acpi_id) |
500 | { | 497 | { |
501 | int i; | 498 | int i; |
502 | int apic_id = -1; | 499 | int apic_id = -1; |
@@ -513,6 +510,7 @@ static int get_cpu_id(acpi_handle handle, int type, u32 acpi_id) | |||
513 | } | 510 | } |
514 | return -1; | 511 | return -1; |
515 | } | 512 | } |
513 | EXPORT_SYMBOL_GPL(acpi_get_cpuid); | ||
516 | #endif | 514 | #endif |
517 | 515 | ||
518 | /* -------------------------------------------------------------------------- | 516 | /* -------------------------------------------------------------------------- |
@@ -579,7 +577,7 @@ static int acpi_processor_get_info(struct acpi_device *device) | |||
579 | device_declaration = 1; | 577 | device_declaration = 1; |
580 | pr->acpi_id = value; | 578 | pr->acpi_id = value; |
581 | } | 579 | } |
582 | cpu_index = get_cpu_id(pr->handle, device_declaration, pr->acpi_id); | 580 | cpu_index = acpi_get_cpuid(pr->handle, device_declaration, pr->acpi_id); |
583 | 581 | ||
584 | /* Handle UP system running SMP kernel, with no LAPIC in MADT */ | 582 | /* Handle UP system running SMP kernel, with no LAPIC in MADT */ |
585 | if (!cpu0_initialized && (cpu_index == -1) && | 583 | if (!cpu0_initialized && (cpu_index == -1) && |