Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull misc x86 fixes from Ingo Molnar:
 "This contains:

   - EFI fixes
   - a boot printout fix
   - ASLR/kASLR fixes
   - intel microcode driver fixes
   - other misc fixes

  Most of the linecount comes from an EFI revert"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm/ASLR: Avoid PAGE_SIZE redefinition for UML subarch
  x86/microcode/intel: Handle truncated microcode images more robustly
  x86/microcode/intel: Guard against stack overflow in the loader
  x86, mm/ASLR: Fix stack randomization on 64-bit systems
  x86/mm/init: Fix incorrect page size in init_memory_mapping() printks
  x86/mm/ASLR: Propagate base load address calculation
  Documentation/x86: Fix path in zero-page.txt
  x86/apic: Fix the devicetree build in certain configs
  Revert "efi/libstub: Call get_memory_map() to obtain map and desc sizes"
  x86/efi: Avoid triple faults during EFI mixed mode calls

1 files changed, 26 insertions, 2 deletions

diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 553c094b9cd7..a110efca6d06 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -238,6 +238,31 @@ static void __init_refok adjust_range_page_size_mask(struct map_range *mr,
         }
 }
 
+static const char *page_size_string(struct map_range *mr)
+{
+        static const char str_1g[] = "1G";
+        static const char str_2m[] = "2M";
+        static const char str_4m[] = "4M";
+        static const char str_4k[] = "4k";
+
+        if (mr->page_size_mask & (1<<PG_LEVEL_1G))
+                return str_1g;
+        /*
+         * 32-bit without PAE has a 4M large page size.
+         * PG_LEVEL_2M is misnamed, but we can at least
+         * print out the right size in the string.
+         */
+        if (IS_ENABLED(CONFIG_X86_32) &&
+            !IS_ENABLED(CONFIG_X86_PAE) &&
+            mr->page_size_mask & (1<<PG_LEVEL_2M))
+                return str_4m;
+
+        if (mr->page_size_mask & (1<<PG_LEVEL_2M))
+                return str_2m;
+
+        return str_4k;
+}
+
 static int __meminit split_mem_range(struct map_range *mr, int nr_range,
                                      unsigned long start,
                                      unsigned long end)
@@ -333,8 +358,7 @@ static int __meminit split_mem_range(struct map_range *mr, int nr_range,
         for (i = 0; i < nr_range; i++)
                 printk(KERN_DEBUG " [mem %#010lx-%#010lx] page %s\n",
                                 mr[i].start, mr[i].end - 1,
-                        (mr[i].page_size_mask & (1<<PG_LEVEL_1G))?"1G":(
-                         (mr[i].page_size_mask & (1<<PG_LEVEL_2M))?"2M":"4k"));
+                                page_size_string(&mr[i]));
 
         return nr_range;
 }