diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-02-05 01:29:14 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 12:44:18 -0500 |
| commit | 5e5419734c8719cbc01af959ad9c0844002c0df5 (patch) | |
| tree | a075dca3f719946689efa0245464855cbf2a20ce /include/asm-xtensa | |
| parent | 9f8f2172537de7af0b0fbd33502d18d52b1339bc (diff) | |
add mm argument to pte/pmd/pud/pgd_free
(with Martin Schwidefsky <schwidefsky@de.ibm.com>)
The pgd/pud/pmd/pte page table allocation functions get a mm_struct pointer as
first argument. The free functions do not get the mm_struct argument. This
is 1) asymmetrical and 2) to do mm related page table allocations the mm
argument is needed on the free function as well.
[kamalesh@linux.vnet.ibm.com: i386 fix]
[akpm@linux-foundation.org: coding-syle fixes]
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-xtensa')
| -rw-r--r-- | include/asm-xtensa/pgalloc.h | 6 | ||||
| -rw-r--r-- | include/asm-xtensa/tlb.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-xtensa/pgalloc.h b/include/asm-xtensa/pgalloc.h index 3e5b56525102..1d51ba5463f9 100644 --- a/include/asm-xtensa/pgalloc.h +++ b/include/asm-xtensa/pgalloc.h | |||
| @@ -31,7 +31,7 @@ pgd_alloc(struct mm_struct *mm) | |||
| 31 | return (pgd_t*) __get_free_pages(GFP_KERNEL | __GFP_ZERO, PGD_ORDER); | 31 | return (pgd_t*) __get_free_pages(GFP_KERNEL | __GFP_ZERO, PGD_ORDER); |
| 32 | } | 32 | } |
| 33 | 33 | ||
| 34 | static inline void pgd_free(pgd_t *pgd) | 34 | static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd) |
| 35 | { | 35 | { |
| 36 | free_page((unsigned long)pgd); | 36 | free_page((unsigned long)pgd); |
| 37 | } | 37 | } |
| @@ -52,12 +52,12 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm, | |||
| 52 | return virt_to_page(pte_alloc_one_kernel(mm, addr)); | 52 | return virt_to_page(pte_alloc_one_kernel(mm, addr)); |
| 53 | } | 53 | } |
| 54 | 54 | ||
| 55 | static inline void pte_free_kernel(pte_t *pte) | 55 | static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte) |
| 56 | { | 56 | { |
| 57 | kmem_cache_free(pgtable_cache, pte); | 57 | kmem_cache_free(pgtable_cache, pte); |
| 58 | } | 58 | } |
| 59 | 59 | ||
| 60 | static inline void pte_free(struct page *page) | 60 | static inline void pte_free(struct mm_struct *mm, struct page *page) |
| 61 | { | 61 | { |
| 62 | kmem_cache_free(pgtable_cache, page_address(page)); | 62 | kmem_cache_free(pgtable_cache, page_address(page)); |
| 63 | } | 63 | } |
diff --git a/include/asm-xtensa/tlb.h b/include/asm-xtensa/tlb.h index 4830232017af..31c220faca02 100644 --- a/include/asm-xtensa/tlb.h +++ b/include/asm-xtensa/tlb.h | |||
| @@ -42,6 +42,6 @@ | |||
| 42 | 42 | ||
| 43 | #include <asm-generic/tlb.h> | 43 | #include <asm-generic/tlb.h> |
| 44 | 44 | ||
| 45 | #define __pte_free_tlb(tlb,pte) pte_free(pte) | 45 | #define __pte_free_tlb(tlb, pte) pte_free((tlb)->mm, pte) |
| 46 | 46 | ||
| 47 | #endif /* _XTENSA_TLB_H */ | 47 | #endif /* _XTENSA_TLB_H */ |