korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-29 23:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

ACPI: use __cpuinit for the acpi_processor_set_pdc() call tree

Browse Source 
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>
This commit is contained in:
Jan Beulich 2011-02-17 16:36:24 +00:00 committed by Len Brown
parent 6430c9c12a
commit af10f941ab
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/ia64/kernel/acpi.c
View File

@ -803,7 +803,7 @@ int acpi_isa_irq_to_gsi(unsigned isa_irq, u32 *gsi)
* ACPI based hotplug CPU support * ACPI based hotplug CPU support
*/ */
#ifdef CONFIG_ACPI_HOTPLUG_CPU #ifdef CONFIG_ACPI_HOTPLUG_CPU
static static __cpuinit
int acpi_map_cpu2node(acpi_handle handle, int cpu, int physid) int acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)
{ {
#ifdef CONFIG_ACPI_NUMA #ifdef CONFIG_ACPI_NUMA
@ -878,7 +878,7 @@ __init void prefill_possible_map(void)
set_cpu_possible(i, true); 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 }; struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
union acpi_object *obj; union acpi_object *obj;
@ -929,6 +929,11 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu)
return (0); 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); EXPORT_SYMBOL(acpi_map_lsapic);
int acpi_unmap_lsapic(int cpu) int acpi_unmap_lsapic(int cpu)

8
drivers/acpi/processor_core.c
View File

@ -223,7 +223,7 @@ static bool __init processor_physically_present(acpi_handle handle)
return true; return true;
} }
static void acpi_set_pdc_bits(u32 *buf) static void __cpuinit acpi_set_pdc_bits(u32 *buf)
{ {
buf[0] = ACPI_PDC_REVISION_ID; buf[0] = ACPI_PDC_REVISION_ID;
buf[1] = 1; buf[1] = 1;
@ -235,7 +235,7 @@ static void acpi_set_pdc_bits(u32 *buf)
arch_acpi_set_pdc_bits(buf); arch_acpi_set_pdc_bits(buf);
} }
static struct acpi_object_list *acpi_processor_alloc_pdc(void) static struct acpi_object_list *__cpuinit acpi_processor_alloc_pdc(void)
{ {
struct acpi_object_list *obj_list; struct acpi_object_list *obj_list;
union acpi_object *obj; union acpi_object *obj;
@ -278,7 +278,7 @@ static struct acpi_object_list *acpi_processor_alloc_pdc(void)
* _PDC is required for a BIOS-OS handshake for most of the newer * _PDC is required for a BIOS-OS handshake for most of the newer
* ACPI processor features. * ACPI processor features.
*/ */
static int static int __cpuinit
acpi_processor_eval_pdc(acpi_handle handle, struct acpi_object_list *pdc_in) acpi_processor_eval_pdc(acpi_handle handle, struct acpi_object_list *pdc_in)
{ {
acpi_status status = AE_OK; acpi_status status = AE_OK;
@ -306,7 +306,7 @@ acpi_processor_eval_pdc(acpi_handle handle, struct acpi_object_list *pdc_in)
return status; return status;
} }
void acpi_processor_set_pdc(acpi_handle handle) void __cpuinit acpi_processor_set_pdc(acpi_handle handle)
{ {
struct acpi_object_list *obj_list; struct acpi_object_list *obj_list;