Merge branch 'x86/mm' into x86/asm, to merge branches

Most of x86/mm is already in x86/asm, so merge the rest too.

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

3 files changed, 10 insertions, 11 deletions

diff --git a/arch/x86/mm/mem_encrypt.c b/arch/x86/mm/mem_encrypt.c
index 5049b8bad3e7..d247c14469de 100644
--- a/arch/x86/mm/mem_encrypt.c
+++ b/arch/x86/mm/mem_encrypt.c
@@ -69,7 +69,6 @@ static void __init __sme_early_enc_dec(resource_size_t paddr,
         if (!sme_me_mask)
                 return;
 
-        local_flush_tlb();
         wbinvd();
 
         /*
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 8dfd13f724d9..77e4d3c5c57b 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -5646,16 +5646,6 @@ void __init sparse_memory_present_with_active_regions(int nid)
         unsigned long start_pfn, end_pfn;
         int i, this_nid;
 
-#ifdef CONFIG_SPARSEMEM_EXTREME
-        if (!mem_section) {
-                unsigned long size, align;
-
-                size = sizeof(struct mem_section) * NR_SECTION_ROOTS;
-                align = 1 << (INTERNODE_CACHE_SHIFT);
-                mem_section = memblock_virt_alloc(size, align);
-        }
-#endif
-
         for_each_mem_pfn_range(i, nid, &start_pfn, &end_pfn, &this_nid)
                 memory_present(this_nid, start_pfn, end_pfn);
 }
diff --git a/mm/sparse.c b/mm/sparse.c
index 044138852baf..60805abf98af 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -207,6 +207,16 @@ void __init memory_present(int nid, unsigned long start, unsigned long end)
 {
         unsigned long pfn;
 
+#ifdef CONFIG_SPARSEMEM_EXTREME
+        if (unlikely(!mem_section)) {
+                unsigned long size, align;
+
+                size = sizeof(struct mem_section) * NR_SECTION_ROOTS;
+                align = 1 << (INTERNODE_CACHE_SHIFT);
+                mem_section = memblock_virt_alloc(size, align);
+        }
+#endif
+
         start &= PAGE_SECTION_MASK;
         mminit_validate_memmodel_limits(&start, &end);
         for (pfn = start; pfn < end; pfn += PAGES_PER_SECTION) {