Messages in this thread Patch in this message | | | Date | Fri, 18 Mar 2011 20:01:50 +0000 | From | Prasad Joshi <> | Subject | Re: [RFC][PATCH v3 13/22] mm, mips: add gfp flags variant of pmd and pte allocations |
| |
- Added __pmd_alloc_one to allocate pages using the given allocation flag.
- Changed pmd_alloc_one to call __pmd_alloc_one and pass GFP_KERNEL | __GFP_REPEAT allocation flag.
- Added __pte_alloc_one_kernel to allocate zeroed pages using the given allocation flag. The function pte_alloc_one_kernel() has been changed to call __pte_alloc_one_kernel() passing GFP_KERNEL | __GFP_REPEAT allocation flags.
- Helps in fixing the Bug 30702
Signed-off-by: Prasad Joshi <prasadjoshi124@gmail.com> Signed-off-by: Anand Mitra <mitra@kqinfotech.com> --- arch/mips/include/asm/pgalloc.h | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h index 881d18b..f2c5439 100644 --- a/arch/mips/include/asm/pgalloc.h +++ b/arch/mips/include/asm/pgalloc.h @@ -64,14 +64,16 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd) free_pages((unsigned long)pgd, PGD_ORDER); } +static inline pte_t *__pte_alloc_one_kernel(struct mm_struct *mm, + unsigned long address, gfp_t gfp_mask) +{ + return (pte_t *) __get_free_pages(gfp_mask | __GFP_ZERO, PTE_ORDER); +} + static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address) { - pte_t *pte; - - pte = (pte_t *) __get_free_pages(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO, PTE_ORDER); - - return pte; + return __pte_alloc_one_kernel(mm, address, GFP_KERNEL | __GFP_REPEAT); } static inline struct page *pte_alloc_one(struct mm_struct *mm, @@ -106,16 +108,22 @@ do { \ #ifndef __PAGETABLE_PMD_FOLDED -static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address) +static inline pmd_t * +__pmd_alloc_one(struct mm_struct *mm, unsigned long address, gfp_t gfp_mask) { pmd_t *pmd; - pmd = (pmd_t *) __get_free_pages(GFP_KERNEL|__GFP_REPEAT, PMD_ORDER); + pmd = (pmd_t *) __get_free_pages(gfp_mask, PMD_ORDER); if (pmd) pmd_init((unsigned long)pmd, (unsigned long)invalid_pte_table); return pmd; } +static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address) +{ + return __pmd_alloc_one(mm, address, GFP_KERNEL | __GFP_REPEAT); +} + static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd) { free_pages((unsigned long)pmd, PMD_ORDER); -- 1.7.0.4
| |