1 files changed, 15 insertions, 13 deletions

diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 00b5d08f6da8..90680255032e 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -69,6 +69,20 @@ unsigned int acpi_cpei_phys_cpuid;
 
 unsigned long acpi_wakeup_address = 0;
 
+#ifdef CONFIG_IA64_GENERIC
+static unsigned long __init acpi_find_rsdp(void)
+{
+        unsigned long rsdp_phys = 0;
+
+        if (efi.acpi20 != EFI_INVALID_TABLE_ADDR)
+                rsdp_phys = efi.acpi20;
+        else if (efi.acpi != EFI_INVALID_TABLE_ADDR)
+                printk(KERN_WARNING PREFIX
+                       "v1.0/r0.71 tables no longer supported\n");
+        return rsdp_phys;
+}
+#endif
+
 const char __init *
 acpi_get_sysname(void)
 {
@@ -152,7 +166,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);
 }
@@ -631,18 +645,6 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table)
         return 0;
 }
 
-unsigned long __init acpi_find_rsdp(void)
-{
-        unsigned long rsdp_phys = 0;
-
-        if (efi.acpi20 != EFI_INVALID_TABLE_ADDR)
-                rsdp_phys = efi.acpi20;
-        else if (efi.acpi != EFI_INVALID_TABLE_ADDR)
-                printk(KERN_WARNING PREFIX
-                       "v1.0/r0.71 tables no longer supported\n");
-        return rsdp_phys;
-}
-
 int __init acpi_boot_init(void)
 {