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

[karo-tx-linux.git] / tools / lguest / lguest.c

diff --git a/tools/lguest/lguest.c b/tools/lguest/lguest.c
index 5d19fdf80292c226769a91ccef519a47b3788b2b..897cd6f3f68720342f7b11ac6e20b4e6e027bad6 100644 (file)
--- a/tools/lguest/lguest.c
+++ b/tools/lguest/lguest.c
@@ -3339,7 +3339,7 @@ int main(int argc, char *argv[])
         * simple, single region.
         */
        boot->e820_entries = 1;
-       boot->e820_map[0] = ((struct e820entry) { 0, mem, E820_RAM });
+       boot->e820_table[0] = ((struct e820_entry) { 0, mem, E820_TYPE_RAM });
        /*
         * The boot header contains a command line pointer: we put the command
         * line after the boot header.