aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/lguest/lguest.c4
-rw-r--r--drivers/video/console/vgacon.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/lguest/lguest.c b/drivers/lguest/lguest.c
index ee1c6d05c3d3..4a579c840301 100644
--- a/drivers/lguest/lguest.c
+++ b/drivers/lguest/lguest.c
@@ -893,7 +893,9 @@ static __init char *lguest_memory_setup(void)
893 893
894 /* The Linux bootloader header contains an "e820" memory map: the 894 /* The Linux bootloader header contains an "e820" memory map: the
895 * Launcher populated the first entry with our memory limit. */ 895 * Launcher populated the first entry with our memory limit. */
896 add_memory_region(E820_MAP->addr, E820_MAP->size, E820_MAP->type); 896 add_memory_region(boot_params.e820_map[0].addr,
897 boot_params.e820_map[0].size,
898 boot_params.e820_map[0].type);
897 899
898 /* This string is for the boot messages. */ 900 /* This string is for the boot messages. */
899 return "LGUEST"; 901 return "LGUEST";
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index e9afb7ebd566..a5698714d43d 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -372,7 +372,7 @@ static const char *vgacon_startup(void)
372#endif 372#endif
373 } 373 }
374 374
375 /* SCREEN_INFO initialized? */ 375 /* boot_params.screen_info initialized? */
376 if ((ORIG_VIDEO_MODE == 0) && 376 if ((ORIG_VIDEO_MODE == 0) &&
377 (ORIG_VIDEO_LINES == 0) && 377 (ORIG_VIDEO_LINES == 0) &&
378 (ORIG_VIDEO_COLS == 0)) 378 (ORIG_VIDEO_COLS == 0))