[RFC][PATCH v3 21/22] mm, arm: add gfp flags variant of pmd and pte allocations
From: Prasad Joshi <hidden>
Date: 2011-03-18 20:08:49
Also in:
lkml
Subsystem:
arm port, the rest · Maintainers:
Russell King, Linus Torvalds
- Added __pmd_alloc_one, which is same as pmd_alloc_one, but has extra parameter to specify the allocation flag - Added __pte_alloc_one_kernel to allocate page using specified GFP flag - Changed pte_alloc_one_kernel to call __pte_alloc_one_kernel newly added function using GFP_KERNEL allocation flag - Helps in fixing the Bug 30702 Signed-off-by: Prasad Joshi <redacted> Signed-off-by: Anand Mitra <redacted> --- arch/arm/include/asm/pgalloc.h | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h
index 22de005..0696068 100644
--- a/arch/arm/include/asm/pgalloc.h
+++ b/arch/arm/include/asm/pgalloc.h@@ -28,6 +28,7 @@ /* * Since we have only two-level page tables, these are trivial */ +#define __pmd_alloc_one(mm,addr,mask) ({ BUG(); ((pmd_t *)2); }) #define pmd_alloc_one(mm,addr) ({ BUG(); ((pmd_t *)2); }) #define pmd_free(mm, pmd) do { } while (0) #define pgd_populate(mm,pmd,pte) BUG()
@@ -59,17 +60,23 @@ static inline void clean_pte_table(pte_t *pte) * +------------+ */ static inline pte_t * -pte_alloc_one_kernel(struct mm_struct *mm, unsigned long addr) +__pte_alloc_one_kernel(struct mm_struct *mm, unsigned long addr, gfp_t gfp_mask) { pte_t *pte; - pte = (pte_t *)__get_free_page(PGALLOC_GFP); + pte = (pte_t *)__get_free_page(gfp_mask | __GFP_NOTRACK | __GFP_ZERO); if (pte) clean_pte_table(pte); return pte; } +static inline pte_t * +pte_alloc_one_kernel(struct mm_struct *mm, unsigned long addr) +{ + return __pte_alloc_one_kernel(mm, addr, GFP_KERNEL | __GFP_REPEAT); +} + static inline pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long addr) {
--
1.7.0.4