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

Pull x86 boot changes from Ingo Molnar:
 "A number of cleanups"

* 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/boot: Standardize strcmp()
  x86/boot/64: Remove pointless early_printk() message
  x86/boot/video: Move the 'video_segment' variable to video.c

diff --combined arch/x86/kernel/head64.c
index c4f8d4659070db99ce190543186bc4a4ac5d2ac9,8c58135b0fa4f459873aaae80acb60f404661b38..2b55ee6db053c79fbe91a6119e613075be54111b
--- 1/arch/x86/kernel/head64.c
--- 2/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
@@@ -27,7 -27,6 +27,7 @@@
  #include <asm/bios_ebda.h>
  #include <asm/bootparam_utils.h>
  #include <asm/microcode.h>
 +#include <asm/kasan.h>
  
  /*
   * Manage page tables very early on.
@@@ -47,7 -46,7 +47,7 @@@ static void __init reset_early_page_tab
  
        next_early_pgt = 0;
  
 -      write_cr3(__pa(early_level4_pgt));
 +      write_cr3(__pa_nodebug(early_level4_pgt));
  }
  
  /* Create a new PMD entry */
@@@ -60,7 -59,7 +60,7 @@@ int __init early_make_pgtable(unsigned 
        pmdval_t pmd, *pmd_p;
  
        /* Invalid address or early pgt is done ?  */
 -      if (physaddr >= MAXMEM || read_cr3() != __pa(early_level4_pgt))
 +      if (physaddr >= MAXMEM || read_cr3() != __pa_nodebug(early_level4_pgt))
                return -1;
  
  again:
@@@ -156,13 -155,9 +156,13 @@@ asmlinkage __visible void __init x86_64
                                (__START_KERNEL & PGDIR_MASK)));
        BUILD_BUG_ON(__fix_to_virt(__end_of_fixed_addresses) <= MODULES_END);
  
 +      cr4_init_shadow();
 +
        /* Kill off the identity-map trampoline */
        reset_early_page_tables();
  
 +      kasan_map_early_shadow(early_level4_pgt);
 +
        /* clear bss before set_intr_gate with early_idt_handler */
        clear_bss();
  
@@@ -177,15 -172,10 +177,12 @@@
         */
        load_ucode_bsp();
  
-       if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
-               early_printk("Kernel alive\n");
- 
        clear_page(init_level4_pgt);
        /* set init_level4_pgt kernel high mapping*/
        init_level4_pgt[511] = early_level4_pgt[511];
  
 +      kasan_map_early_shadow(init_level4_pgt);
 +
        x86_64_start_reservations(real_mode_data);
  }