Merge branch 'linus' into x86/mm to pick up fixes and to fix conflicts

[people/arne_f/kernel.git] / arch / x86 / kernel / acpi / boot.c

diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 7491e73d92530bf868a9b91b2c71c892bcbdb94a..97bb2caf342879ba365582d3bd7b1caab5f77dfe 100644 (file)
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -115,7 +115,7 @@ static u32 isa_irq_to_gsi[NR_IRQS_LEGACY] __read_mostly = {
 #define        ACPI_INVALID_GSI                INT_MIN
 
 /*
- * This is just a simple wrapper around early_ioremap(),
+ * This is just a simple wrapper around early_memremap(),
  * with sanity checks for phys == 0 and size == 0.
  */
 char *__init __acpi_map_table(unsigned long phys, unsigned long size)
@@ -124,7 +124,7 @@ char *__init __acpi_map_table(unsigned long phys, unsigned long size)
        if (!phys || !size)
                return NULL;
 
-       return early_ioremap(phys, size);
+       return early_memremap(phys, size);
 }
 
 void __init __acpi_unmap_table(char *map, unsigned long size)
@@ -132,7 +132,7 @@ void __init __acpi_unmap_table(char *map, unsigned long size)
        if (!map || !size)
                return;
 
-       early_iounmap(map, size);
+       early_memunmap(map, size);
 }
 
 #ifdef CONFIG_X86_LOCAL_APIC