From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 27 Mar 2018 06:43:39 +0000 (+0200)
Subject: Merge tag 'v4.16-rc7' into x86/mm, to fix up conflict
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0bc91d4ba77156ae9217d25ed7c434540f950d05;p=linux.git

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>
---

0bc91d4ba77156ae9217d25ed7c434540f950d05
diff --cc arch/x86/mm/init_64.c
index 9bbc51ae54a68,af11a28902355..45241de66785e
--- a/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 4845871a2006a,f9cfbc0d1f337..7f443bd1411d1
--- a/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;
  	}