Merge branch 'linus' into x86/memory-corruption-check

diff --cc arch/x86/kernel/Makefile
Simple merge

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc arch/x86/mm/init_32.c
Simple merge

diff --cc arch/x86/mm/init_64.c
index d6ef158,9db01db..9f7a0d2
--- 1/arch/x86/mm/init_64.c
--- 2/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@@ -878,7 -900,10 +900,8 @@@ static struct kcore_list kcore_mem, kco
  void __init mem_init(void)
  {
        long codesize, reservedpages, datasize, initsize;
+       unsigned long absent_pages;
  
 -      start_periodic_check_for_corruption();
 -
        pci_iommu_alloc();
  
        /* clear_bss() already clear the empty_zero_page */