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 /arch/arm | |
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 'arch/arm')
-rw-r--r-- | arch/arm/kernel/smp.c | 2 | ||||
-rw-r--r-- | arch/arm/mm/ioremap.c | 2 | ||||
-rw-r--r-- | arch/arm/mm/pgd.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index e9dfbab46cb6..eefae1de334c 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c | |||
@@ -150,7 +150,7 @@ int __cpuinit __cpu_up(unsigned int cpu) | |||
150 | secondary_data.pgdir = 0; | 150 | secondary_data.pgdir = 0; |
151 | 151 | ||
152 | *pmd_offset(pgd, PHYS_OFFSET) = __pmd(0); | 152 | *pmd_offset(pgd, PHYS_OFFSET) = __pmd(0); |
153 | pgd_free(pgd); | 153 | pgd_free(&init_mm, pgd); |
154 | 154 | ||
155 | if (ret) { | 155 | if (ret) { |
156 | printk(KERN_CRIT "CPU%u: processor failed to boot\n", cpu); | 156 | printk(KERN_CRIT "CPU%u: processor failed to boot\n", cpu); |
diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c index 75952779ce19..303a7ff6bfd2 100644 --- a/arch/arm/mm/ioremap.c +++ b/arch/arm/mm/ioremap.c | |||
@@ -162,7 +162,7 @@ static void unmap_area_sections(unsigned long virt, unsigned long size) | |||
162 | * Free the page table, if there was one. | 162 | * Free the page table, if there was one. |
163 | */ | 163 | */ |
164 | if ((pmd_val(pmd) & PMD_TYPE_MASK) == PMD_TYPE_TABLE) | 164 | if ((pmd_val(pmd) & PMD_TYPE_MASK) == PMD_TYPE_TABLE) |
165 | pte_free_kernel(pmd_page_vaddr(pmd)); | 165 | pte_free_kernel(&init_mm, pmd_page_vaddr(pmd)); |
166 | } | 166 | } |
167 | 167 | ||
168 | addr += PGDIR_SIZE; | 168 | addr += PGDIR_SIZE; |
diff --git a/arch/arm/mm/pgd.c b/arch/arm/mm/pgd.c index 50b9aed6000d..500c9610ab30 100644 --- a/arch/arm/mm/pgd.c +++ b/arch/arm/mm/pgd.c | |||
@@ -65,14 +65,14 @@ pgd_t *get_pgd_slow(struct mm_struct *mm) | |||
65 | return new_pgd; | 65 | return new_pgd; |
66 | 66 | ||
67 | no_pte: | 67 | no_pte: |
68 | pmd_free(new_pmd); | 68 | pmd_free(mm, new_pmd); |
69 | no_pmd: | 69 | no_pmd: |
70 | free_pages((unsigned long)new_pgd, 2); | 70 | free_pages((unsigned long)new_pgd, 2); |
71 | no_pgd: | 71 | no_pgd: |
72 | return NULL; | 72 | return NULL; |
73 | } | 73 | } |
74 | 74 | ||
75 | void free_pgd_slow(pgd_t *pgd) | 75 | void free_pgd_slow(struct mm_struct *mm, pgd_t *pgd) |
76 | { | 76 | { |
77 | pmd_t *pmd; | 77 | pmd_t *pmd; |
78 | struct page *pte; | 78 | struct page *pte; |
@@ -94,8 +94,8 @@ void free_pgd_slow(pgd_t *pgd) | |||
94 | pmd_clear(pmd); | 94 | pmd_clear(pmd); |
95 | dec_zone_page_state(virt_to_page((unsigned long *)pgd), NR_PAGETABLE); | 95 | dec_zone_page_state(virt_to_page((unsigned long *)pgd), NR_PAGETABLE); |
96 | pte_lock_deinit(pte); | 96 | pte_lock_deinit(pte); |
97 | pte_free(pte); | 97 | pte_free(mm, pte); |
98 | pmd_free(pmd); | 98 | pmd_free(mm, pmd); |
99 | free: | 99 | free: |
100 | free_pages((unsigned long) pgd, 2); | 100 | free_pages((unsigned long) pgd, 2); |
101 | } | 101 | } |