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-m68k | |
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-m68k')
-rw-r--r-- | include/asm-m68k/motorola_pgalloc.h | 10 | ||||
-rw-r--r-- | include/asm-m68k/sun3_pgalloc.h | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/include/asm-m68k/motorola_pgalloc.h b/include/asm-m68k/motorola_pgalloc.h index 5158412cd54d..500ec9b8b189 100644 --- a/include/asm-m68k/motorola_pgalloc.h +++ b/include/asm-m68k/motorola_pgalloc.h | |||
@@ -22,7 +22,7 @@ static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long ad | |||
22 | return pte; | 22 | return pte; |
23 | } | 23 | } |
24 | 24 | ||
25 | static inline void pte_free_kernel(pte_t *pte) | 25 | static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte) |
26 | { | 26 | { |
27 | cache_page(pte); | 27 | cache_page(pte); |
28 | free_page((unsigned long) pte); | 28 | free_page((unsigned long) pte); |
@@ -47,7 +47,7 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm, unsigned long add | |||
47 | return page; | 47 | return page; |
48 | } | 48 | } |
49 | 49 | ||
50 | static inline void pte_free(struct page *page) | 50 | static inline void pte_free(struct mm_struct *mm, struct page *page) |
51 | { | 51 | { |
52 | cache_page(kmap(page)); | 52 | cache_page(kmap(page)); |
53 | kunmap(page); | 53 | kunmap(page); |
@@ -67,7 +67,7 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address) | |||
67 | return get_pointer_table(); | 67 | return get_pointer_table(); |
68 | } | 68 | } |
69 | 69 | ||
70 | static inline int pmd_free(pmd_t *pmd) | 70 | static inline int pmd_free(struct mm_struct *mm, pmd_t *pmd) |
71 | { | 71 | { |
72 | return free_pointer_table(pmd); | 72 | return free_pointer_table(pmd); |
73 | } | 73 | } |
@@ -78,9 +78,9 @@ static inline int __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd) | |||
78 | } | 78 | } |
79 | 79 | ||
80 | 80 | ||
81 | static inline void pgd_free(pgd_t *pgd) | 81 | static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd) |
82 | { | 82 | { |
83 | pmd_free((pmd_t *)pgd); | 83 | pmd_free(mm, (pmd_t *)pgd); |
84 | } | 84 | } |
85 | 85 | ||
86 | static inline pgd_t *pgd_alloc(struct mm_struct *mm) | 86 | static inline pgd_t *pgd_alloc(struct mm_struct *mm) |
diff --git a/include/asm-m68k/sun3_pgalloc.h b/include/asm-m68k/sun3_pgalloc.h index fd8241117649..a5a91e72714b 100644 --- a/include/asm-m68k/sun3_pgalloc.h +++ b/include/asm-m68k/sun3_pgalloc.h | |||
@@ -21,12 +21,12 @@ extern const char bad_pmd_string[]; | |||
21 | #define pmd_alloc_one(mm,address) ({ BUG(); ((pmd_t *)2); }) | 21 | #define pmd_alloc_one(mm,address) ({ BUG(); ((pmd_t *)2); }) |
22 | 22 | ||
23 | 23 | ||
24 | static inline void pte_free_kernel(pte_t * pte) | 24 | static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte) |
25 | { | 25 | { |
26 | free_page((unsigned long) pte); | 26 | free_page((unsigned long) pte); |
27 | } | 27 | } |
28 | 28 | ||
29 | static inline void pte_free(struct page *page) | 29 | static inline void pte_free(struct mm_struct *mm, struct page *page) |
30 | { | 30 | { |
31 | __free_page(page); | 31 | __free_page(page); |
32 | } | 32 | } |
@@ -72,10 +72,10 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, struct page *p | |||
72 | * allocating and freeing a pmd is trivial: the 1-entry pmd is | 72 | * allocating and freeing a pmd is trivial: the 1-entry pmd is |
73 | * inside the pgd, so has no extra memory associated with it. | 73 | * inside the pgd, so has no extra memory associated with it. |
74 | */ | 74 | */ |
75 | #define pmd_free(x) do { } while (0) | 75 | #define pmd_free(mm, x) do { } while (0) |
76 | #define __pmd_free_tlb(tlb, x) do { } while (0) | 76 | #define __pmd_free_tlb(tlb, x) do { } while (0) |
77 | 77 | ||
78 | static inline void pgd_free(pgd_t * pgd) | 78 | static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd) |
79 | { | 79 | { |
80 | free_page((unsigned long) pgd); | 80 | free_page((unsigned long) pgd); |
81 | } | 81 | } |