powerpc-book3s64-radix-remove-mmu_vmemmap_psize.patch removed from -mm tree
The quilt patch titled
Subject: powerpc/book3s64/radix: remove mmu_vmemmap_psize
has been removed from the -mm tree. Its filename was
powerpc-book3s64-radix-remove-mmu_vmemmap_psize.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: "Aneesh Kumar K.V" <[email protected]>
Subject: powerpc/book3s64/radix: remove mmu_vmemmap_psize
Date: Tue, 25 Jul 2023 00:37:58 +0530
This is not used by radix anymore.
---
arch/powerpc/mm/book3s64/radix_pgtable.c | 11 ----------- arch/powerpc/mm/init_64.c | 21 ++++++++++++++------- 2 files changed, 14 insertions(+), 18 deletions(-)
arch/powerpc/mm/book3s64/radix_pgtable.c renamed from arch/powerpc/mm/book3s64/radix_pgtable.c~powerpc-book3s64-radix-remove-mmu_vmemmap_psize +0 -11
@@ -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 renamed from arch/powerpc/mm/init_64.c~powerpc-book3s64-radix-remove-mmu_vmemmap_psize +14 -7
@@ -198,17 +198,12 @@ bool altmap_cross_boundary(struct vmem_areturn false; } -int __meminit vmemmap_populate (unsigned long start,unsigned long end,int node, -struct vmem_altmap *altmap) +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(unsignedreturn 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) {
_
Patches currently in -mm which might be from [email protected] are
mm-memory_hotplug-simplify-arch_mhp_memmap_on_memory_enable-kconfig.patch mm-memory_hotplug-allow-memmap-on-memory-hotplug-request-to-fallback.patch mm-memory_hotplug-allow-architecture-to-override-memmap-on-memory-support-check.patch mm-memory_hotplug-support-memmap_on_memory-when-memmap-is-not-aligned-to-pageblocks.patch powerpc-book3s64-memhotplug-enable-memmap-on-memory-for-radix.patch mm-memory_hotplug-embed-vmem_altmap-details-in-memory-block.patch