diff options
| author | Jan Beulich <JBeulich@novell.com> | 2011-02-17 11:36:24 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-03-02 20:58:20 -0500 |
| commit | af10f941ab7807d8b0bb3c66e679d8a6bbbe7485 (patch) | |
| tree | 511903623315fafbcf1494aa39f2ff1b6fc8b9d1 /arch/ia64 | |
| parent | 6430c9c12a7dbb8f60f0d8294b73b3c0bb03f64f (diff) | |
ACPI: use __cpuinit for the acpi_processor_set_pdc() call tree
Once acpi_map_lsapic() in ia64 follows how x86 treats it wrt section
placement, the whole tree from acpi_processor_set_pdc() can become
__cpuinit.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Acked-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
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 90ebceb899a0..522642d6a503 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) | |||
| 803 | * ACPI based hotplug CPU support | 803 | * ACPI based hotplug CPU support |
| 804 | */ | 804 | */ |
| 805 | #ifdef CONFIG_ACPI_HOTPLUG_CPU | 805 | #ifdef CONFIG_ACPI_HOTPLUG_CPU |
| 806 | static | 806 | static __cpuinit |
| 807 | int acpi_map_cpu2node(acpi_handle handle, int cpu, int physid) | 807 | int acpi_map_cpu2node(acpi_handle handle, int cpu, int physid) |
| 808 | { | 808 | { |
| 809 | #ifdef CONFIG_ACPI_NUMA | 809 | #ifdef CONFIG_ACPI_NUMA |
| @@ -878,7 +878,7 @@ __init void prefill_possible_map(void) | |||
| 878 | set_cpu_possible(i, true); | 878 | set_cpu_possible(i, true); |
| 879 | } | 879 | } |
| 880 | 880 | ||
| 881 | int acpi_map_lsapic(acpi_handle handle, int *pcpu) | 881 | static int __cpuinit _acpi_map_lsapic(acpi_handle handle, int *pcpu) |
| 882 | { | 882 | { |
| 883 | struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; | 883 | struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; |
| 884 | union acpi_object *obj; | 884 | union acpi_object *obj; |
| @@ -929,6 +929,11 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu) | |||
| 929 | return (0); | 929 | return (0); |
| 930 | } | 930 | } |
| 931 | 931 | ||
| 932 | /* wrapper to silence section mismatch warning */ | ||
| 933 | int __ref acpi_map_lsapic(acpi_handle handle, int *pcpu) | ||
| 934 | { | ||
| 935 | return _acpi_map_lsapic(handle, pcpu); | ||
| 936 | } | ||
| 932 | EXPORT_SYMBOL(acpi_map_lsapic); | 937 | EXPORT_SYMBOL(acpi_map_lsapic); |
| 933 | 938 | ||
| 934 | int acpi_unmap_lsapic(int cpu) | 939 | int acpi_unmap_lsapic(int cpu) |
