Merge branch 'x86/boot' into x86/mm, to avoid conflict

There's a conflict between ongoing level-5 paging support and
the E820 rewrite. Since the E820 rewrite is essentially ready,
merge it into x86/mm to reduce tree conflicts.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index 2604189d6cd1..9b9ac04593fb 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -556,7 +556,7 @@ void __init acpi_table_upgrade(void)
          * But it's not enough on X86 because ioremap will
          * complain later (used by acpi_os_map_memory) that the pages
          * that should get mapped are not marked "reserved".
-         * Both memblock_reserve and e820_add_region (via arch_reserve_mem_area)
+         * Both memblock_reserve and e820__range_add (via arch_reserve_mem_area)
          * works fine.
          */
         memblock_reserve(acpi_tables_addr, all_tables_size);