[x86] remove uses of magic macros for boot_params access

Instead of using magic macros for boot_params access, simply use the
boot_params structure.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

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)
 
         /* 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";
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)
 #endif
         }
 
-        /* SCREEN_INFO initialized? */
+        /* boot_params.screen_info initialized? */
         if ((ORIG_VIDEO_MODE  == 0) &&
             (ORIG_VIDEO_LINES == 0) &&
             (ORIG_VIDEO_COLS  == 0))