Merge branch 'xen-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen

[linux-2.6-omap-h63xx.git] / drivers / lguest / lguest.c

diff --git a/drivers/lguest/lguest.c b/drivers/lguest/lguest.c
index c302629e0895d13501953b2590b07c65f7dbb0af..3ba337dde8575e1570ed9f0ee77d0c9170247efc 100644 (file)
--- a/drivers/lguest/lguest.c
+++ b/drivers/lguest/lguest.c
@@ -881,7 +881,9 @@ static __init char *lguest_memory_setup(void)
 
        /* The Linux bootloader header contains an "e820" memory map: the
         * Launcher populated the first entry with our memory limit. */
-       add_memory_region(E820_MAP->addr, E820_MAP->size, E820_MAP->type);
+       add_memory_region(boot_params.e820_map[0].addr,
+                         boot_params.e820_map[0].size,
+                         boot_params.e820_map[0].type);
 
        /* This string is for the boot messages. */
        return "LGUEST";