microblaze-simplify-pte_alloc_one_kernel.patch removed from -mm tree
The patch titled
Subject: microblaze: simplify pte_alloc_one_kernel()
has been removed from the -mm tree. Its filename was
microblaze-simplify-pte_alloc_one_kernel.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Mike Rapoport <[email protected]>
Subject: microblaze: simplify pte_alloc_one_kernel()
The microblaze's implementation of pte_alloc_one_kernel() used memblock_alloc_try_nid_raw() along with clear_page() to allocated a zeroed page during early setup.
Replace calls of these functions with a call to memblock_alloc_try_nid() that already returns zeroed page and respects the same allocation limits as memblock_alloc_try_nid_raw().
While on it drop early_get_page() wrapper that was only used in pte_alloc_one_kernel().
---
arch/microblaze/include/asm/pgtable.h | 2 -- arch/microblaze/mm/init.c | 12 ------------ arch/microblaze/mm/pgtable.c | 17 ++++++++--------- 3 files changed, 8 insertions(+), 23 deletions(-)
arch/microblaze/include/asm/pgtable.h renamed from arch/microblaze/include/asm/pgtable.h~microblaze-simplify-pte_alloc_one_kernel +0 -2
@@ -443,8 +443,6 @@ extern int mem_init_done; asmlinkage void __init mmu_init(void); -void __init *early_get_page (void ); -#endif /* __ASSEMBLY__ */ #endif /* __KERNEL__ */
arch/microblaze/mm/init.c renamed from arch/microblaze/mm/init.c~microblaze-simplify-pte_alloc_one_kernel +0 -12
@@ -265,18 +265,6 @@ asmlinkage void __init mmu_init(void)dma_contiguous_reserve (memory_start + lowmem_size -1 ); } -/* This is only called until mem_init is done. */ -void __init *early_get_page (void ) -{ -/* -* Mem start + kernel_tlb -> here is limit -* because of mem mapping from head.S -*/ -return memblock_alloc_try_nid_raw (PAGE_SIZE ,PAGE_SIZE , -MEMBLOCK_LOW_LIMIT , memory_start + kernel_tlb, -NUMA_NO_NODE ); -} -void *__ref zalloc_maybe_bootmem (size_t size,gfp_t mask) {void *p;
arch/microblaze/mm/pgtable.c renamed from arch/microblaze/mm/pgtable.c~microblaze-simplify-pte_alloc_one_kernel +8 -9
@@ -33,6 +33,7 @@#include <linux/init.h> #include <linux/mm_types.h> #include <linux/pgtable.h> +#include <linux/memblock.h> #include <asm/pgalloc.h> #include <linux/io.h>
@@ -242,15 +243,13 @@ unsigned long iopa(unsigned long addr)__ref pte_t *pte_alloc_one_kernel (struct mm_struct *mm) { -pte_t *pte; -if (mem_init_done) { - pte = (pte_t *)__get_free_page (GFP_KERNEL | __GFP_ZERO); - }else { - pte = (pte_t *)early_get_page (); -if (pte) -clear_page (pte); - } -return pte; +if (mem_init_done) +return (pte_t *)__get_free_page (GFP_KERNEL | __GFP_ZERO); +else +return memblock_alloc_try_nid (PAGE_SIZE ,PAGE_SIZE , +MEMBLOCK_LOW_LIMIT , + memory_start + kernel_tlb, +NUMA_NO_NODE ); }void __set_fixmap (enum fixed_addresses idx,phys_addr_t phys,pgprot_t flags)
_
Patches currently in -mm which might be from [email protected] are
mm-remove-pfn_valid_within-and-config_holes_in_zone.patch mm-memory_hotplug-cleanup-after-removal-of-pfn_valid_within.patch