Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756921Ab1CNRsf (ORCPT ); Mon, 14 Mar 2011 13:48:35 -0400 Received: from mail-qw0-f46.google.com ([209.85.216.46]:40354 "EHLO mail-qw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751554Ab1CNRsc (ORCPT ); Mon, 14 Mar 2011 13:48:32 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=MZz/og0zbm1Zm3mARgWK+FP9+hEg70M/gbIxaMnMsKmSllVZzUNX1MUiYF/V1Gly72 a/nLU9lVXpSLExyLDQhlsRfUeZqC0qgF6bXbcCrqwp0rmi/VkN2312c9QCkiSSkeZ8QN sh+xdP+yXclj8cYjSYjSYPtFGLQQw+fLo7jA8= MIME-Version: 1.0 Date: Mon, 14 Mar 2011 17:48:31 +0000 Message-ID: Subject: [RFC][PATCH v2 11/23] (mn10300) __vmalloc: add gfp flags variant of pte and pmd allocation From: Prasad Joshi To: Koichi Yasutake , linux-am33-list@redhat.com, Prasad Joshi , Anand Mitra , Andrew Morton , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2222 Lines: 61 __vmalloc: propagating GFP allocation flag. - adds functions to allow caller to pass the GFP flag for memory allocation - helps in fixing the Bug 30702 (__vmalloc(GFP_NOFS) can callback file system evict_inode). Signed-off-by: Anand Mitra Signed-off-by: Prasad Joshi --- Chnagelog: arch/mn10300/include/asm/pgalloc.h | 2 ++ arch/mn10300/mm/pgtable.c | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) --- diff --git a/arch/mn10300/include/asm/pgalloc.h b/arch/mn10300/include/asm/pgalloc.h index 146bacf..35150ae 100644 --- a/arch/mn10300/include/asm/pgalloc.h +++ b/arch/mn10300/include/asm/pgalloc.h @@ -37,6 +37,8 @@ extern pgd_t *pgd_alloc(struct mm_struct *); extern void pgd_free(struct mm_struct *, pgd_t *); extern pte_t *pte_alloc_one_kernel(struct mm_struct *, unsigned long); +extern pte_t *__pte_alloc_one_kernel(struct mm_struct *, unsigned long, gfp_t); + extern struct page *pte_alloc_one(struct mm_struct *, unsigned long); static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte) diff --git a/arch/mn10300/mm/pgtable.c b/arch/mn10300/mm/pgtable.c index 450f7ba..05077b4 100644 --- a/arch/mn10300/mm/pgtable.c +++ b/arch/mn10300/mm/pgtable.c @@ -62,14 +62,20 @@ void set_pmd_pfn(unsigned long vaddr, unsigned long pfn, pgprot_t flags) local_flush_tlb_one(vaddr); } -pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address) +pte_t *__pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address, + gfp_t gfp_mask) { - pte_t *pte = (pte_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT); + pte_t *pte = (pte_t *)__get_free_page(gfp_mask); if (pte) clear_page(pte); return pte; } +pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address) +{ + return __pte_alloc_one_kernel(mm, address, GFP_KERNEL | __GFP_REPEAT); +} + struct page *pte_alloc_one(struct mm_struct *mm, unsigned long address) { struct page *pte; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/