Merge tag 'v4.16-rc7' into x86/mm, to fix up conflict

 Conflicts:
	arch/x86/mm/init_64.c

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

diff --cc arch/x86/boot/compressed/misc.c
Simple merge

diff --cc arch/x86/entry/entry_64.S
Simple merge

diff --cc arch/x86/kernel/cpu/intel.c
Simple merge

diff --cc arch/x86/mm/init_64.c
index 9bbc51ae54a682495b84c54ba47e6a4690f0b599,af11a2890235584a5f07cfe7f83a00ea71fc47f9..45241de66785ea683d334951c95f04951562b533
--- 1/arch/x86/mm/init_64.c
--- 2/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@@ -1099,8 -1089,8 +1095,8 @@@ remove_p4d_table(p4d_t *p4d_start, unsi
                 * 5-level case we should free them. This code will have to change
                 * to adapt for boot-time switching between 4 and 5 level page tables.
                 */
 -              if (CONFIG_PGTABLE_LEVELS == 5)
 +              if (pgtable_l5_enabled)
-                       free_pud_table(pud_base, p4d, altmap);
+                       free_pud_table(pud_base, p4d);
        }
  
        if (direct)

diff --cc arch/x86/platform/efi/efi_64.c
index 4845871a2006a94a77b5cd2f91b7852ae0ebbc5e,f9cfbc0d1f337e63b9a744cdb423ba2ecd6712f8..7f443bd1411d155254aac8167130baff64957b23
--- 1/arch/x86/platform/efi/efi_64.c
--- 2/arch/x86/platform/efi/efi_64.c
+++ b/arch/x86/platform/efi/efi_64.c
@@@ -227,9 -225,9 +227,9 @@@ int __init efi_alloc_page_tables(void
  
        pud = pud_alloc(&init_mm, p4d, EFI_VA_END);
        if (!pud) {
 -              if (CONFIG_PGTABLE_LEVELS > 4)
 +              if (pgtable_l5_enabled)
                        free_page((unsigned long) pgd_page_vaddr(*pgd));
-               free_page((unsigned long)efi_pgd);
+               free_pages((unsigned long)efi_pgd, PGD_ALLOCATION_ORDER);
                return -ENOMEM;
        }