Merge branch 'linus' into WIP.x86/boot, to fix up conflicts and to pick up updates

[karo-tx-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 ae32838cac5fd2251e1ffa0bbb8b8c629e399a84..a468f0fdc9075bbdc04d75f5105620c97d0ddf48 100644 (file)
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -37,6 +37,7 @@
 #include <linux/pci.h>
 #include <linux/efi-bgrt.h>
 
+#include <asm/e820/api.h>
 #include <asm/irqdomain.h>
 #include <asm/pci_x86.h>
 #include <asm/pgtable.h>
@@ -1724,6 +1725,6 @@ int __acpi_release_global_lock(unsigned int *lock)
 
 void __init arch_reserve_mem_area(acpi_physical_address addr, size_t size)
 {
-       e820_add_region(addr, size, E820_ACPI);
-       update_e820();
+       e820__range_add(addr, size, E820_TYPE_ACPI);
+       e820__update_table_print();
 }