Merge branch 'linus' into x86/microcode, to pick up merge window changes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --combined arch/x86/mm/init.c
index dffd162,cc82830..fb4c1b4
--- 1/arch/x86/mm/init.c
--- 2/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@@ -17,6 -17,7 +17,7 @@@
  #include <asm/proto.h>
  #include <asm/dma.h>          /* for MAX_DMA_PFN */
  #include <asm/microcode.h>
+ #include <asm/kaslr.h>
  
  /*
   * We need to define the tracepoints somewhere, and tlb.c
@@@ -590,6 -591,9 +591,9 @@@ void __init init_mem_mapping(void
        /* the ISA range is always mapped regardless of memory holes */
        init_memory_mapping(0, ISA_END_ADDRESS);
  
+       /* Init the trampoline, possibly with KASLR memory offset */
+       init_trampoline();
+ 
        /*
         * If the allocation is in bottom-up direction, we setup direct mapping
         * in bottom-up, otherwise we setup direct mapping in top-down.
@@@ -696,6 -700,13 +700,6 @@@ void free_initmem(void
  void __init free_initrd_mem(unsigned long start, unsigned long end)
  {
        /*
 -       * Remember, initrd memory may contain microcode or other useful things.
 -       * Before we lose initrd mem, we need to find a place to hold them
 -       * now that normal virtual memory is enabled.
 -       */
 -      save_microcode_in_initrd();
 -
 -      /*
         * end could be not aligned, and We can not align that,
         * decompresser could be confused by aligned initrd_end
         * We already reserve the end partial page before in