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

[mirror_ubuntu-artful-kernel.git] / arch / x86 / xen / enlighten.c

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 6efa0cc425a22f405fd86ff98e10164a8be51050..30822e8e64aceff30d0a8a6810b62fcf1cd62d57 100644 (file)
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -76,6 +76,7 @@
 #include <asm/mwait.h>
 #include <asm/pci_x86.h>
 #include <asm/cpu.h>
+#include <asm/e820/api.h> 
 
 #ifdef CONFIG_ACPI
 #include <linux/acpi.h>
@@ -1689,34 +1690,32 @@ static void __init init_pvh_bootparams(void)
 
        memset(&pvh_bootparams, 0, sizeof(pvh_bootparams));
 
-       memmap.nr_entries = ARRAY_SIZE(pvh_bootparams.e820_map);
-       set_xen_guest_handle(memmap.buffer, pvh_bootparams.e820_map);
+       memmap.nr_entries = ARRAY_SIZE(pvh_bootparams.e820_table);
+       set_xen_guest_handle(memmap.buffer, pvh_bootparams.e820_table);
        rc = HYPERVISOR_memory_op(XENMEM_memory_map, &memmap);
        if (rc) {
                xen_raw_printk("XENMEM_memory_map failed (%d)\n", rc);
                BUG();
        }
 
-       if (memmap.nr_entries < E820MAX - 1) {
-               pvh_bootparams.e820_map[memmap.nr_entries].addr =
+       if (memmap.nr_entries < E820_MAX_ENTRIES_ZEROPAGE - 1) {
+               pvh_bootparams.e820_table[memmap.nr_entries].addr =
                        ISA_START_ADDRESS;
-               pvh_bootparams.e820_map[memmap.nr_entries].size =
+               pvh_bootparams.e820_table[memmap.nr_entries].size =
                        ISA_END_ADDRESS - ISA_START_ADDRESS;
-               pvh_bootparams.e820_map[memmap.nr_entries].type =
-                       E820_RESERVED;
+               pvh_bootparams.e820_table[memmap.nr_entries].type =
+                       E820_TYPE_RESERVED;
                memmap.nr_entries++;
        } else
                xen_raw_printk("Warning: Can fit ISA range into e820\n");
 
-       sanitize_e820_map(pvh_bootparams.e820_map,
-                         ARRAY_SIZE(pvh_bootparams.e820_map),
-                         &memmap.nr_entries);
-
        pvh_bootparams.e820_entries = memmap.nr_entries;
        for (i = 0; i < pvh_bootparams.e820_entries; i++)
-               e820_add_region(pvh_bootparams.e820_map[i].addr,
-                               pvh_bootparams.e820_map[i].size,
-                               pvh_bootparams.e820_map[i].type);
+               e820__range_add(pvh_bootparams.e820_table[i].addr,
+                               pvh_bootparams.e820_table[i].size,
+                               pvh_bootparams.e820_table[i].type);
+
+       e820__update_table(e820_table);
 
        pvh_bootparams.hdr.cmd_line_ptr =
                pvh_start_info.cmdline_paddr;