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-alpha | |
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-alpha')
-rw-r--r-- | include/asm-alpha/pgalloc.h | 8 | ||||
-rw-r--r-- | include/asm-alpha/tlb.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/asm-alpha/pgalloc.h b/include/asm-alpha/pgalloc.h index 471864e8d4c3..fdbedacc7375 100644 --- a/include/asm-alpha/pgalloc.h +++ b/include/asm-alpha/pgalloc.h | |||
@@ -31,7 +31,7 @@ pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd) | |||
31 | extern pgd_t *pgd_alloc(struct mm_struct *mm); | 31 | extern pgd_t *pgd_alloc(struct mm_struct *mm); |
32 | 32 | ||
33 | static inline void | 33 | static inline void |
34 | pgd_free(pgd_t *pgd) | 34 | 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 | } |
@@ -44,7 +44,7 @@ pmd_alloc_one(struct mm_struct *mm, unsigned long address) | |||
44 | } | 44 | } |
45 | 45 | ||
46 | static inline void | 46 | static inline void |
47 | pmd_free(pmd_t *pmd) | 47 | pmd_free(struct mm_struct *mm, pmd_t *pmd) |
48 | { | 48 | { |
49 | free_page((unsigned long)pmd); | 49 | free_page((unsigned long)pmd); |
50 | } | 50 | } |
@@ -52,7 +52,7 @@ pmd_free(pmd_t *pmd) | |||
52 | extern pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long addr); | 52 | extern pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long addr); |
53 | 53 | ||
54 | static inline void | 54 | static inline void |
55 | pte_free_kernel(pte_t *pte) | 55 | pte_free_kernel(struct mm_struct *mm, pte_t *pte) |
56 | { | 56 | { |
57 | free_page((unsigned long)pte); | 57 | free_page((unsigned long)pte); |
58 | } | 58 | } |
@@ -67,7 +67,7 @@ pte_alloc_one(struct mm_struct *mm, unsigned long addr) | |||
67 | } | 67 | } |
68 | 68 | ||
69 | static inline void | 69 | static inline void |
70 | pte_free(struct page *page) | 70 | pte_free(struct mm_struct *mm, struct page *page) |
71 | { | 71 | { |
72 | __free_page(page); | 72 | __free_page(page); |
73 | } | 73 | } |
diff --git a/include/asm-alpha/tlb.h b/include/asm-alpha/tlb.h index aa91335533e0..c13636575fba 100644 --- a/include/asm-alpha/tlb.h +++ b/include/asm-alpha/tlb.h | |||
@@ -9,7 +9,7 @@ | |||
9 | 9 | ||
10 | #include <asm-generic/tlb.h> | 10 | #include <asm-generic/tlb.h> |
11 | 11 | ||
12 | #define __pte_free_tlb(tlb,pte) pte_free(pte) | 12 | #define __pte_free_tlb(tlb, pte) pte_free((tlb)->mm, pte) |
13 | #define __pmd_free_tlb(tlb,pmd) pmd_free(pmd) | 13 | #define __pmd_free_tlb(tlb, pmd) pmd_free((tlb)->mm, pmd) |
14 | 14 | ||
15 | #endif | 15 | #endif |