Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d04fdafc authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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: default avatarIngo Molnar <mingo@kernel.org>
parents 7980f029 c5e26089

arch/x86/mm/mem_encrypt.c

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ static void __init __sme_early_enc_dec(resource_size_t paddr, 
	if (!sme_me_mask)

		return;



	local_flush_tlb();

	wbinvd();



	/*

mm/page_alloc.c

+0 −10
Original line number Diff line number Diff line
@@ -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);

}

mm/sparse.c

+10 −0
Original line number Diff line number Diff line
@@ -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) {