Merge branch 'drm-next-4.10' of git://people.freedesktop.org/~agd5f/linux into drm...

[karo-tx-linux.git] / arch / x86 / kernel / tboot.c

diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
index 654f6c66fe45b2426c0e2a74a50e478c135eb216..8402907825b02706f87283c45b5e27086a9cce0b 100644 (file)
--- a/arch/x86/kernel/tboot.c
+++ b/arch/x86/kernel/tboot.c
@@ -188,12 +188,12 @@ static int tboot_setup_sleep(void)
 
        tboot->num_mac_regions = 0;
 
-       for (i = 0; i < e820.nr_map; i++) {
-               if ((e820.map[i].type != E820_RAM)
-                && (e820.map[i].type != E820_RESERVED_KERN))
+       for (i = 0; i < e820->nr_map; i++) {
+               if ((e820->map[i].type != E820_RAM)
+                && (e820->map[i].type != E820_RESERVED_KERN))
                        continue;
 
-               add_mac_region(e820.map[i].addr, e820.map[i].size);
+               add_mac_region(e820->map[i].addr, e820->map[i].size);
        }
 
        tboot->acpi_sinfo.kernel_s3_resume_vector =