Commit 601f006f authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Andrew Morton
Browse files

powerpc/book3s64/radix: remove mmu_vmemmap_psize 

This is not used by radix anymore.

[aneesh.kumar@linux.ibm.com: fix kernel build error]
  Link: https://lkml.kernel.org/r/874jlowd0c.fsf@linux.ibm.com
Link: https://lkml.kernel.org/r/20230724190759.483013-13-aneesh.kumar@linux.ibm.com


Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Joao Martins <joao.m.martins@oracle.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent f2b79c0d

arch/powerpc/mm/book3s64/radix_pgtable.c

+0 −11
Original line number Diff line number Diff line
@@ -601,17 +601,6 @@ void __init radix__early_init_mmu(void) 
#else

	mmu_virtual_psize = MMU_PAGE_4K;

#endif



#ifdef CONFIG_SPARSEMEM_VMEMMAP

	/* vmemmap mapping */

	if (mmu_psize_defs[MMU_PAGE_2M].shift) {

		/*

		 * map vmemmap using 2M if available

		 */

		mmu_vmemmap_psize = MMU_PAGE_2M;

	} else

		mmu_vmemmap_psize = mmu_virtual_psize;

#endif

#endif

	/*

	 * initialize page table size

arch/powerpc/mm/init_64.c

+14 −7
Original line number Diff line number Diff line
@@ -198,17 +198,12 @@ bool altmap_cross_boundary(struct vmem_altmap *altmap, unsigned long start, 
	return false;

}



int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,

static int __meminit __vmemmap_populate(unsigned long start, unsigned long end, int node,

					struct vmem_altmap *altmap)

{

	bool altmap_alloc;

	unsigned long page_size = 1 << mmu_psize_defs[mmu_vmemmap_psize].shift;



#ifdef CONFIG_PPC_BOOK3S_64

	if (radix_enabled())

		return radix__vmemmap_populate(start, end, node, altmap);

#endif



	/* Align to the page size of the linear mapping. */

	start = ALIGN_DOWN(start, page_size);
@@ -277,6 +272,18 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node, 
	return 0;

}



int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,

			       struct vmem_altmap *altmap)

{



#ifdef CONFIG_PPC_BOOK3S_64

	if (radix_enabled())

		return radix__vmemmap_populate(start, end, node, altmap);

#endif



	return __vmemmap_populate(start, end, node, altmap);

}



#ifdef CONFIG_MEMORY_HOTPLUG

static unsigned long vmemmap_list_free(unsigned long start)

{