Merge remote-tracking branch 'origin/x86/boot' into x86/mm2

[deliverable/linux.git] / arch / x86 / kernel / acpi / boot.c

diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index e48cafcf92ae4614ca43e7a504fb36ea7af79dea..cfc755dc1607b0c8d51bef3b2b12a9ffa94b2c25 100644 (file)
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -51,7 +51,6 @@ EXPORT_SYMBOL(acpi_disabled);
 
 #ifdef CONFIG_X86_64
 # include <asm/proto.h>
-# include <asm/numa_64.h>
 #endif                         /* X86 */
 
 #define BAD_MADT_ENTRY(entry, end) (                                       \
@@ -1706,3 +1705,9 @@ int __acpi_release_global_lock(unsigned int *lock)
        } while (unlikely (val != old));
        return old & 0x1;
 }
+
+void __init arch_reserve_mem_area(acpi_physical_address addr, size_t size)
+{
+       e820_add_region(addr, size, E820_ACPI);
+       update_e820();
+}