.. as it it used only during early boot.
Signed-off-by: Jan Beulich <[EMAIL PROTECTED]>
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(-)
--- linux-2.6.24-rc5/arch/ia64/kernel/acpi.c 2007-12-12 11:28:03.000000000
+0100
+++ 2.6.24-rc5-acpi-map-table-init/arch/ia64/kernel/acpi.c 2007-12-04
16:09:33.000000000 +0100
@@ -152,7 +152,7 @@ int acpi_request_vector(u32 int_type)
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);
}
--- linux-2.6.24-rc5/arch/x86/kernel/acpi/boot.c 2007-12-12
11:28:17.000000000 +0100
+++ 2.6.24-rc5-acpi-map-table-init/arch/x86/kernel/acpi/boot.c 2007-12-04
16:09:33.000000000 +0100
@@ -106,7 +106,7 @@ enum acpi_irq_model_id acpi_irq_model =
#ifdef CONFIG_X86_64
/* 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)
return NULL;
@@ -131,7 +131,7 @@ char *__acpi_map_table(unsigned long phy
* from the fixed base. That's why we start at FIX_IO_APIC_BASE_END and
* 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;
int idx;
--- linux-2.6.24-rc5/drivers/acpi/osl.c 2007-12-12 11:28:21.000000000 +0100
+++ 2.6.24-rc5-acpi-map-table-init/drivers/acpi/osl.c 2007-12-04
16:09:33.000000000 +0100
@@ -211,7 +211,8 @@ acpi_physical_address __init acpi_os_get
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) {
printk(KERN_ERR PREFIX "Cannot map memory that high\n");
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
