From: Ingo Molnar <mingo@kernel.org>
Date: Sat, 24 Mar 2018 08:25:26 +0000 (+0100)
Subject: Merge branch 'linus' into x86/dma, to resolve a conflict with upstream
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ea2301b6220117398a1de4f4bc853fbe886d5e08;p=linux.git

Merge branch 'linus' into x86/dma, to resolve a conflict with upstream

Conflicts:
	arch/x86/mm/init_64.c

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

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