acpi: make __acpi_map_table() and __init function
.. as it it used only during early boot. Signed-off-by: Jan Beulich <jbeulich@novell.com> arch/ia64/kernel/acpi.c | 2 +- arch/x86/kernel/acpi/boot.c | 4 ++-- drivers/acpi/osl.c | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
@@ -152,7 +152,7 @@ int acpi_request_vector(u32 int_type)
|
|||||||
return vector;
|
return vector;
|
||||||
}
|
}
|
||||||
|
|
||||||
char *__acpi_map_table(unsigned long phys_addr, unsigned long size)
|
char *__init __acpi_map_table(unsigned long phys_addr, unsigned long size)
|
||||||
{
|
{
|
||||||
return __va(phys_addr);
|
return __va(phys_addr);
|
||||||
}
|
}
|
||||||
|
@@ -106,7 +106,7 @@ enum acpi_irq_model_id acpi_irq_model = ACPI_IRQ_MODEL_PIC;
|
|||||||
#ifdef CONFIG_X86_64
|
#ifdef CONFIG_X86_64
|
||||||
|
|
||||||
/* rely on all ACPI tables being in the direct mapping */
|
/* rely on all ACPI tables being in the direct mapping */
|
||||||
char *__acpi_map_table(unsigned long phys_addr, unsigned long size)
|
char *__init __acpi_map_table(unsigned long phys_addr, unsigned long size)
|
||||||
{
|
{
|
||||||
if (!phys_addr || !size)
|
if (!phys_addr || !size)
|
||||||
return NULL;
|
return NULL;
|
||||||
@@ -131,7 +131,7 @@ char *__acpi_map_table(unsigned long phys_addr, unsigned long size)
|
|||||||
* from the fixed base. That's why we start at FIX_IO_APIC_BASE_END and
|
* from the fixed base. That's why we start at FIX_IO_APIC_BASE_END and
|
||||||
* count idx down while incrementing the phys address.
|
* count idx down while incrementing the phys address.
|
||||||
*/
|
*/
|
||||||
char *__acpi_map_table(unsigned long phys, unsigned long size)
|
char *__init __acpi_map_table(unsigned long phys, unsigned long size)
|
||||||
{
|
{
|
||||||
unsigned long base, offset, mapped_size;
|
unsigned long base, offset, mapped_size;
|
||||||
int idx;
|
int idx;
|
||||||
|
@@ -211,7 +211,8 @@ acpi_physical_address __init acpi_os_get_root_pointer(void)
|
|||||||
return acpi_find_rsdp();
|
return acpi_find_rsdp();
|
||||||
}
|
}
|
||||||
|
|
||||||
void __iomem *acpi_os_map_memory(acpi_physical_address phys, acpi_size size)
|
void __iomem *__init_refok
|
||||||
|
acpi_os_map_memory(acpi_physical_address phys, acpi_size size)
|
||||||
{
|
{
|
||||||
if (phys > ULONG_MAX) {
|
if (phys > ULONG_MAX) {
|
||||||
printk(KERN_ERR PREFIX "Cannot map memory that high\n");
|
printk(KERN_ERR PREFIX "Cannot map memory that high\n");
|
||||||
|
Reference in New Issue
Block a user