Re: [RFC][PATCH v3 07/22] mm, sh: add gfp flags variant of pmd and
From: Prasad Joshi <hidden>
Date: 2011-03-18 19:52:35
Also in:
lkml
Subsystem:
superh, the rest · Maintainers:
Yoshinori Sato, Rich Felker, John Paul Adrian Glaubitz, Linus Torvalds
- Added __pte_alloc_one_kernel() function to allow caller to allocation flag. Like pte_alloc_one_kernel() this newly added function calls quicklist_alloc() and passes the allocation flag down the call hierarchy. - The function pte_alloc_one_kernel() is modified to call __pte_alloc_one_kernel() using the correct allocation flag. - Similar changes for pmd allocations. Added function __pmd_alloc_one(). - The changes help in fixing the Bug 30702. Signed-off-by: Prasad Joshi <redacted> Signed-off-by: Anand Mitra <redacted> --- arch/sh/include/asm/pgalloc.h | 8 +++++++- arch/sh/mm/pgtable.c | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/arch/sh/include/asm/pgalloc.h b/arch/sh/include/asm/pgalloc.h
index 8c00785..aaed989 100644
--- a/arch/sh/include/asm/pgalloc.h
+++ b/arch/sh/include/asm/pgalloc.h@@ -31,10 +31,16 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, /* * Allocate and free page tables. */ +static inline pte_t *__pte_alloc_one_kernel(struct mm_struct *mm, + unsigned long address, gfp_t gfp_mask) +{ + return quicklist_alloc(QUICK_PT, gfp_mask, NULL); +} + static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address) { - return quicklist_alloc(QUICK_PT, GFP_KERNEL | __GFP_REPEAT, NULL); + return __pte_alloc_one_kernel(mm, address, GFP_KERNEL | __GFP_REPEAT); } static inline pgtable_t pte_alloc_one(struct mm_struct *mm,
diff --git a/arch/sh/mm/pgtable.c b/arch/sh/mm/pgtable.c
index 26e03a1..b938eb8 100644
--- a/arch/sh/mm/pgtable.c
+++ b/arch/sh/mm/pgtable.c@@ -45,9 +45,15 @@ void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd) set_pud(pud, __pud((unsigned long)pmd)); } +pmd_t * +__pmd_alloc_one(struct mm_struct *mm, unsigned long address, gfp_t gfp_mask) +{ + return kmem_cache_alloc(pmd_cachep, gfp_mask | __GFP_ZERO); +} + pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address) { - return kmem_cache_alloc(pmd_cachep, PGALLOC_GFP); + return __pmd_alloc_one(mm, address, GFP_KERNEL | __GFP_REPEAT); } void pmd_free(struct mm_struct *mm, pmd_t *pmd)
--
1.7.0.4