diff options
| author | Len Brown <len.brown@intel.com> | 2011-03-23 02:19:58 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-03-23 02:19:58 -0400 |
| commit | 8a9026d2e91b2c46744396222b0e878b2622c567 (patch) | |
| tree | c6609ba77c16d91a1d92a4ab113999afb0788479 /arch/ia64 | |
| parent | 3c7ef2138aff285e376aefb74330392442cb2f2d (diff) | |
| parent | cdf2a4eeded69f66ec8c5098c375fe49e0820127 (diff) | |
| download | linux-stable-8a9026d2e91b2c46744396222b0e878b2622c567.tar.gz linux-stable-8a9026d2e91b2c46744396222b0e878b2622c567.tar.bz2 linux-stable-8a9026d2e91b2c46744396222b0e878b2622c567.zip | |
Merge branch 'misc' into release
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/kernel/acpi.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index a54d054ed4b0..3be485a300b1 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c @@ -803,7 +803,7 @@ int acpi_isa_irq_to_gsi(unsigned isa_irq, u32 *gsi) * ACPI based hotplug CPU support */ #ifdef CONFIG_ACPI_HOTPLUG_CPU -static +static __cpuinit int acpi_map_cpu2node(acpi_handle handle, int cpu, int physid) { #ifdef CONFIG_ACPI_NUMA @@ -878,7 +878,7 @@ __init void prefill_possible_map(void) set_cpu_possible(i, true); } -int acpi_map_lsapic(acpi_handle handle, int *pcpu) +static int __cpuinit _acpi_map_lsapic(acpi_handle handle, int *pcpu) { struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; union acpi_object *obj; @@ -929,6 +929,11 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu) return (0); } +/* wrapper to silence section mismatch warning */ +int __ref acpi_map_lsapic(acpi_handle handle, int *pcpu) +{ + return _acpi_map_lsapic(handle, pcpu); +} EXPORT_SYMBOL(acpi_map_lsapic); int acpi_unmap_lsapic(int cpu) |