1 files changed, 2 insertions, 45 deletions

diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index d2a58431a074..680b7300a489 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -78,7 +78,6 @@ int acpi_ht __initdata = 1;	/* enable HT */
 int acpi_lapic;
 int acpi_ioapic;
 int acpi_strict;
-EXPORT_SYMBOL(acpi_strict);
 
 u8 acpi_sci_flags __initdata;
 int acpi_sci_override_gsi __initdata;
@@ -106,7 +105,7 @@ enum acpi_irq_model_id acpi_irq_model = ACPI_IRQ_MODEL_PIC;
 #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 +130,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
  * 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;
@@ -490,8 +489,6 @@ int acpi_register_gsi(u32 gsi, int triggering, int polarity)
         return irq;
 }
 
-EXPORT_SYMBOL(acpi_register_gsi);
-
 /*
  *  ACPI based hotplug support for CPU
  */
@@ -587,25 +584,6 @@ int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base)
 
 EXPORT_SYMBOL(acpi_unregister_ioapic);
 
-static unsigned long __init
-acpi_scan_rsdp(unsigned long start, unsigned long length)
-{
-        unsigned long offset = 0;
-        unsigned long sig_len = sizeof("RSD PTR ") - 1;
-
-        /*
-         * Scan all 16-byte boundaries of the physical memory region for the
-         * RSDP signature.
-         */
-        for (offset = 0; offset < length; offset += 16) {
-                if (strncmp((char *)(phys_to_virt(start) + offset), "RSD PTR ", sig_len))
-                        continue;
-                return (start + offset);
-        }
-
-        return 0;
-}
-
 static int __init acpi_parse_sbf(struct acpi_table_header *table)
 {
         struct acpi_table_boot *sb;
@@ -748,27 +726,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_enabled) {
-                if (efi.acpi20 != EFI_INVALID_TABLE_ADDR)
-                        return efi.acpi20;
-                else if (efi.acpi != EFI_INVALID_TABLE_ADDR)
-                        return efi.acpi;
-        }
-        /*
-         * Scan memory looking for the RSDP signature. First search EBDA (low
-         * memory) paragraphs and then search upper memory (E0000-FFFFF).
-         */
-        rsdp_phys = acpi_scan_rsdp(0, 0x400);
-        if (!rsdp_phys)
-                rsdp_phys = acpi_scan_rsdp(0xE0000, 0x20000);
-
-        return rsdp_phys;
-}
-
 #ifdef  CONFIG_X86_LOCAL_APIC
 /*
  * Parse LAPIC entries in MADT