Commit 5e541973 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Linus Torvalds

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: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: default avatarKamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9f8f2172
...@@ -150,7 +150,7 @@ int __cpuinit __cpu_up(unsigned int cpu) ...@@ -150,7 +150,7 @@ int __cpuinit __cpu_up(unsigned int cpu)
secondary_data.pgdir = 0; secondary_data.pgdir = 0;
*pmd_offset(pgd, PHYS_OFFSET) = __pmd(0); *pmd_offset(pgd, PHYS_OFFSET) = __pmd(0);
pgd_free(pgd); pgd_free(&init_mm, pgd);
if (ret) { if (ret) {
printk(KERN_CRIT "CPU%u: processor failed to boot\n", cpu); printk(KERN_CRIT "CPU%u: processor failed to boot\n", cpu);
......
...@@ -162,7 +162,7 @@ static void unmap_area_sections(unsigned long virt, unsigned long size) ...@@ -162,7 +162,7 @@ static void unmap_area_sections(unsigned long virt, unsigned long size)
* Free the page table, if there was one. * Free the page table, if there was one.
*/ */
if ((pmd_val(pmd) & PMD_TYPE_MASK) == PMD_TYPE_TABLE) if ((pmd_val(pmd) & PMD_TYPE_MASK) == PMD_TYPE_TABLE)
pte_free_kernel(pmd_page_vaddr(pmd)); pte_free_kernel(&init_mm, pmd_page_vaddr(pmd));
} }
addr += PGDIR_SIZE; addr += PGDIR_SIZE;
......
...@@ -65,14 +65,14 @@ pgd_t *get_pgd_slow(struct mm_struct *mm) ...@@ -65,14 +65,14 @@ pgd_t *get_pgd_slow(struct mm_struct *mm)
return new_pgd; return new_pgd;
no_pte: no_pte:
pmd_free(new_pmd); pmd_free(mm, new_pmd);
no_pmd: no_pmd:
free_pages((unsigned long)new_pgd, 2); free_pages((unsigned long)new_pgd, 2);
no_pgd: no_pgd:
return NULL; return NULL;
} }
void free_pgd_slow(pgd_t *pgd) void free_pgd_slow(struct mm_struct *mm, pgd_t *pgd)
{ {
pmd_t *pmd; pmd_t *pmd;
struct page *pte; struct page *pte;
...@@ -94,8 +94,8 @@ void free_pgd_slow(pgd_t *pgd) ...@@ -94,8 +94,8 @@ void free_pgd_slow(pgd_t *pgd)
pmd_clear(pmd); pmd_clear(pmd);
dec_zone_page_state(virt_to_page((unsigned long *)pgd), NR_PAGETABLE); dec_zone_page_state(virt_to_page((unsigned long *)pgd), NR_PAGETABLE);
pte_lock_deinit(pte); pte_lock_deinit(pte);
pte_free(pte); pte_free(mm, pte);
pmd_free(pmd); pmd_free(mm, pmd);
free: free:
free_pages((unsigned long) pgd, 2); free_pages((unsigned long) pgd, 2);
} }
...@@ -140,7 +140,7 @@ pgd_t *pgd_alloc(struct mm_struct *mm) ...@@ -140,7 +140,7 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
return pgd; return pgd;
} }
void pgd_free(pgd_t *pgd) void pgd_free(struct mm_struct *mm, pgd_t *pgd)
{ {
/* in the non-PAE case, clear_page_tables() clears user pgd entries */ /* in the non-PAE case, clear_page_tables() clears user pgd entries */
quicklist_free(0, pgd_dtor, pgd); quicklist_free(0, pgd_dtor, pgd);
......
...@@ -86,7 +86,7 @@ pgd_t *pgd_alloc(struct mm_struct *mm) ...@@ -86,7 +86,7 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
return ret; return ret;
} }
void pgd_free(pgd_t *pgd) void pgd_free(struct mm_struct *mm, pgd_t *pgd)
{ {
free_pages((unsigned long)pgd, PGDIR_ORDER); free_pages((unsigned long)pgd, PGDIR_ORDER);
} }
...@@ -123,7 +123,7 @@ struct page *pte_alloc_one(struct mm_struct *mm, unsigned long address) ...@@ -123,7 +123,7 @@ struct page *pte_alloc_one(struct mm_struct *mm, unsigned long address)
return ptepage; return ptepage;
} }
void pte_free_kernel(pte_t *pte) void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
{ {
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
hash_page_sync(); hash_page_sync();
...@@ -131,7 +131,7 @@ void pte_free_kernel(pte_t *pte) ...@@ -131,7 +131,7 @@ void pte_free_kernel(pte_t *pte)
free_page((unsigned long)pte); free_page((unsigned long)pte);
} }
void pte_free(struct page *ptepage) void pte_free(struct mm_struct *mm, struct page *ptepage)
{ {
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
hash_page_sync(); hash_page_sync();
......
...@@ -74,7 +74,7 @@ pgd_t *pgd_alloc(struct mm_struct *mm) ...@@ -74,7 +74,7 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
return ret; return ret;
} }
void pgd_free(pgd_t *pgd) void pgd_free(struct mm_struct *mm, pgd_t *pgd)
{ {
free_pages((unsigned long)pgd, PGDIR_ORDER); free_pages((unsigned long)pgd, PGDIR_ORDER);
} }
...@@ -111,7 +111,7 @@ struct page *pte_alloc_one(struct mm_struct *mm, unsigned long address) ...@@ -111,7 +111,7 @@ struct page *pte_alloc_one(struct mm_struct *mm, unsigned long address)
return ptepage; return ptepage;
} }
void pte_free_kernel(pte_t *pte) void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
{ {
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
hash_page_sync(); hash_page_sync();
...@@ -119,7 +119,7 @@ void pte_free_kernel(pte_t *pte) ...@@ -119,7 +119,7 @@ void pte_free_kernel(pte_t *pte)
free_page((unsigned long)pte); free_page((unsigned long)pte);
} }
void pte_free(struct page *ptepage) void pte_free(struct mm_struct *mm, struct page *ptepage)
{ {
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
hash_page_sync(); hash_page_sync();
......
...@@ -348,7 +348,7 @@ pgd_t *pgd_alloc(struct mm_struct *mm) ...@@ -348,7 +348,7 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
return pgd; return pgd;
} }
void pgd_free(pgd_t *pgd) void pgd_free(struct mm_struct *mm, pgd_t *pgd)
{ {
free_page((unsigned long) pgd); free_page((unsigned long) pgd);
} }
......
...@@ -58,9 +58,9 @@ static int init_stub_pte(struct mm_struct *mm, unsigned long proc, ...@@ -58,9 +58,9 @@ static int init_stub_pte(struct mm_struct *mm, unsigned long proc,
return 0; return 0;
out_pmd: out_pmd:
pud_free(pud); pud_free(mm, pud);
out_pte: out_pte:
pmd_free(pmd); pmd_free(mm, pmd);
out: out:
return -ENOMEM; return -ENOMEM;
} }
...@@ -144,10 +144,10 @@ void destroy_context(struct mm_struct *mm) ...@@ -144,10 +144,10 @@ void destroy_context(struct mm_struct *mm)
if (!proc_mm || !ptrace_faultinfo) { if (!proc_mm || !ptrace_faultinfo) {
free_page(mmu->id.stack); free_page(mmu->id.stack);
pte_lock_deinit(virt_to_page(mmu->last_page_table)); pte_lock_deinit(virt_to_page(mmu->last_page_table));
pte_free_kernel((pte_t *) mmu->last_page_table); pte_free_kernel(mm, (pte_t *) mmu->last_page_table);
dec_zone_page_state(virt_to_page(mmu->last_page_table), NR_PAGETABLE); dec_zone_page_state(virt_to_page(mmu->last_page_table), NR_PAGETABLE);
#ifdef CONFIG_3_LEVEL_PGTABLES #ifdef CONFIG_3_LEVEL_PGTABLES
pmd_free((pmd_t *) mmu->last_pmd); pmd_free(mm, (pmd_t *) mmu->last_pmd);
#endif #endif
} }
......
...@@ -272,7 +272,7 @@ static void pgd_dtor(void *pgd) ...@@ -272,7 +272,7 @@ static void pgd_dtor(void *pgd)
* preallocate which never got a corresponding vma will need to be * preallocate which never got a corresponding vma will need to be
* freed manually. * freed manually.
*/ */
static void pgd_mop_up_pmds(pgd_t *pgdp) static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
{ {
int i; int i;
...@@ -285,7 +285,7 @@ static void pgd_mop_up_pmds(pgd_t *pgdp) ...@@ -285,7 +285,7 @@ static void pgd_mop_up_pmds(pgd_t *pgdp)
pgdp[i] = native_make_pgd(0); pgdp[i] = native_make_pgd(0);
paravirt_release_pd(pgd_val(pgd) >> PAGE_SHIFT); paravirt_release_pd(pgd_val(pgd) >> PAGE_SHIFT);
pmd_free(pmd); pmd_free(mm, pmd);
} }
} }
} }
...@@ -313,7 +313,7 @@ static int pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd) ...@@ -313,7 +313,7 @@ static int pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd)
pmd_t *pmd = pmd_alloc_one(mm, addr); pmd_t *pmd = pmd_alloc_one(mm, addr);
if (!pmd) { if (!pmd) {
pgd_mop_up_pmds(pgd); pgd_mop_up_pmds(mm, pgd);
return 0; return 0;
} }
...@@ -333,7 +333,7 @@ static int pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd) ...@@ -333,7 +333,7 @@ static int pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd)
return 1; return 1;
} }
static void pgd_mop_up_pmds(pgd_t *pgd) static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
{ {
} }
#endif /* CONFIG_X86_PAE */ #endif /* CONFIG_X86_PAE */
...@@ -352,9 +352,9 @@ pgd_t *pgd_alloc(struct mm_struct *mm) ...@@ -352,9 +352,9 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
return pgd; return pgd;
} }
void pgd_free(pgd_t *pgd) void pgd_free(struct mm_struct *mm, pgd_t *pgd)
{ {
pgd_mop_up_pmds(pgd); pgd_mop_up_pmds(mm, pgd);
quicklist_free(0, pgd_dtor, pgd); quicklist_free(0, pgd_dtor, pgd);
} }
......
...@@ -31,7 +31,7 @@ pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd) ...@@ -31,7 +31,7 @@ pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
extern pgd_t *pgd_alloc(struct mm_struct *mm); extern pgd_t *pgd_alloc(struct mm_struct *mm);
static inline void static inline void
pgd_free(pgd_t *pgd) pgd_free(struct mm_struct *mm, pgd_t *pgd)
{ {
free_page((unsigned long)pgd); free_page((unsigned long)pgd);
} }
...@@ -44,7 +44,7 @@ pmd_alloc_one(struct mm_struct *mm, unsigned long address) ...@@ -44,7 +44,7 @@ pmd_alloc_one(struct mm_struct *mm, unsigned long address)
} }
static inline void static inline void
pmd_free(pmd_t *pmd) pmd_free(struct mm_struct *mm, pmd_t *pmd)
{ {
free_page((unsigned long)pmd); free_page((unsigned long)pmd);
} }
...@@ -52,7 +52,7 @@ pmd_free(pmd_t *pmd) ...@@ -52,7 +52,7 @@ pmd_free(pmd_t *pmd)
extern pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long addr); extern pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long addr);
static inline void static inline void
pte_free_kernel(pte_t *pte) pte_free_kernel(struct mm_struct *mm, pte_t *pte)
{ {
free_page((unsigned long)pte); free_page((unsigned long)pte);
} }
...@@ -67,7 +67,7 @@ pte_alloc_one(struct mm_struct *mm, unsigned long addr) ...@@ -67,7 +67,7 @@ pte_alloc_one(struct mm_struct *mm, unsigned long addr)
} }
static inline void static inline void
pte_free(struct page *page) pte_free(struct mm_struct *mm, struct page *page)
{ {
__free_page(page); __free_page(page);
} }
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include <asm-generic/tlb.h> #include <asm-generic/tlb.h>
#define __pte_free_tlb(tlb,pte) pte_free(pte) #define __pte_free_tlb(tlb, pte) pte_free((tlb)->mm, pte)
#define __pmd_free_tlb(tlb,pmd) pmd_free(pmd) #define __pmd_free_tlb(tlb, pmd) pmd_free((tlb)->mm, pmd)
#endif #endif
...@@ -27,14 +27,14 @@ ...@@ -27,14 +27,14 @@
* Since we have only two-level page tables, these are trivial * Since we have only two-level page tables, these are trivial
*/ */
#define pmd_alloc_one(mm,addr) ({ BUG(); ((pmd_t *)2); }) #define pmd_alloc_one(mm,addr) ({ BUG(); ((pmd_t *)2); })
#define pmd_free(pmd) do { } while (0) #define pmd_free(mm, pmd) do { } while (0)
#define pgd_populate(mm,pmd,pte) BUG() #define pgd_populate(mm,pmd,pte) BUG()
extern pgd_t *get_pgd_slow(struct mm_struct *mm); extern pgd_t *get_pgd_slow(struct mm_struct *mm);
extern void free_pgd_slow(pgd_t *pgd); extern void free_pgd_slow(struct mm_struct *mm, pgd_t *pgd);
#define pgd_alloc(mm) get_pgd_slow(mm) #define pgd_alloc(mm) get_pgd_slow(mm)
#define pgd_free(pgd) free_pgd_slow(pgd) #define pgd_free(mm, pgd) free_pgd_slow(mm, pgd)
/* /*
* Allocate one PTE table. * Allocate one PTE table.
...@@ -83,7 +83,7 @@ pte_alloc_one(struct mm_struct *mm, unsigned long addr) ...@@ -83,7 +83,7 @@ pte_alloc_one(struct mm_struct *mm, unsigned long addr)
/* /*
* Free one PTE table. * Free one PTE table.
*/ */
static inline void pte_free_kernel(pte_t *pte) static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
{ {
if (pte) { if (pte) {
pte -= PTRS_PER_PTE; pte -= PTRS_PER_PTE;
...@@ -91,7 +91,7 @@ static inline void pte_free_kernel(pte_t *pte) ...@@ -91,7 +91,7 @@ static inline void pte_free_kernel(pte_t *pte)
} }
} }
static inline void pte_free(struct page *pte) static inline void pte_free(struct mm_struct *mm, struct page *pte)
{ {
__free_page(pte); __free_page(pte);
} }
......
...@@ -85,8 +85,8 @@ tlb_end_vma(struct mmu_gather *tlb, struct vm_area_struct *vma) ...@@ -85,8 +85,8 @@ tlb_end_vma(struct mmu_gather *tlb, struct vm_area_struct *vma)
} }
#define tlb_remove_page(tlb,page) free_page_and_swap_cache(page) #define tlb_remove_page(tlb,page) free_page_and_swap_cache(page)
#define pte_free_tlb(tlb,ptep) pte_free(ptep) #define pte_free_tlb(tlb, ptep) pte_free((tlb)->mm, ptep)
#define pmd_free_tlb(tlb,pmdp) pmd_free(pmdp) #define pmd_free_tlb(tlb, pmdp) pmd_free((tlb)->mm, pmdp)
#define tlb_migrate_finish(mm) do { } while (0) #define tlb_migrate_finish(mm) do { } while (0)
......
...@@ -30,7 +30,7 @@ static __inline__ pgd_t *pgd_alloc(struct mm_struct *mm) ...@@ -30,7 +30,7 @@ static __inline__ pgd_t *pgd_alloc(struct mm_struct *mm)
return kcalloc(USER_PTRS_PER_PGD, sizeof(pgd_t), GFP_KERNEL); return kcalloc(USER_PTRS_PER_PGD, sizeof(pgd_t), GFP_KERNEL);
} }
static inline void pgd_free(pgd_t *pgd) static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
{ {
kfree(pgd); kfree(pgd);
} }
...@@ -55,12 +55,12 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm, ...@@ -55,12 +55,12 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm,
return pte; return pte;
} }
static inline void pte_free_kernel(pte_t *pte) static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
{ {
free_page((unsigned long)pte); free_page((unsigned long)pte);
} }
static inline void pte_free(struct page *pte) static inline void pte_free(struct mm_struct *mm, struct page *pte)
{ {
__free_page(pte); __free_page(pte);
} }
......
...@@ -16,7 +16,7 @@ static inline pgd_t *pgd_alloc (struct mm_struct *mm) ...@@ -16,7 +16,7 @@ static inline pgd_t *pgd_alloc (struct mm_struct *mm)
return (pgd_t *)get_zeroed_page(GFP_KERNEL); return (pgd_t *)get_zeroed_page(GFP_KERNEL);
} }
static inline void pgd_free (pgd_t *pgd) static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
{ {
free_page((unsigned long)pgd); free_page((unsigned long)pgd);
} }
...@@ -34,12 +34,12 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm, unsigned long add ...@@ -34,12 +34,12 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm, unsigned long add
return pte; return pte;
} }
static inline void pte_free_kernel(pte_t *pte) static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
{ {
free_page((unsigned long)pte); free_page((unsigned long)pte);
} }
static inline void pte_free(struct page *pte) static inline void pte_free(struct mm_struct *mm, struct page *pte)
{ {
__free_page(pte); __free_page(pte);
} }
......
...@@ -31,18 +31,18 @@ do { \ ...@@ -31,18 +31,18 @@ do { \
*/ */
extern pgd_t *pgd_alloc(struct mm_struct *); extern pgd_t *pgd_alloc(struct mm_struct *);
extern void pgd_free(pgd_t *); extern void pgd_free(struct mm_struct *mm, 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);
extern struct page *pte_alloc_one(struct mm_struct *, unsigned long); extern struct page *pte_alloc_one(struct mm_struct *, unsigned long);
static inline void pte_free_kernel(pte_t *pte) static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
{ {
free_page((unsigned long)pte); free_page((unsigned long)pte);
} }
static inline void pte_free(struct page *pte) static inline void pte_free(struct mm_struct *mm, struct page *pte)
{ {
__free_page(pte); __free_page(pte);
} }
...@@ -55,7 +55,7 @@ static inline void pte_free(struct page *pte) ...@@ -55,7 +55,7 @@ static inline void pte_free(struct page *pte)
* (In the PAE case we free the pmds as part of the pgd.) * (In the PAE case we free the pmds as part of the pgd.)
*/ */
#define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *) 2); }) #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *) 2); })
#define pmd_free(x) do { } while (0) #define pmd_free(mm, x) do { } while (0)
#define __pmd_free_tlb(tlb,x) do { } while (0) #define __pmd_free_tlb(tlb,x) do { } while (0)
#endif /* CONFIG_MMU */ #endif /* CONFIG_MMU */
......
...@@ -226,7 +226,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address) ...@@ -226,7 +226,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
* inside the pgd, so has no extra memory associated with it. * inside the pgd, so has no extra memory associated with it.
*/ */
#define pud_alloc_one(mm, address) NULL #define pud_alloc_one(mm, address) NULL
#define pud_free(x) do { } while (0) #define pud_free(mm, x) do { } while (0)
#define __pud_free_tlb(tlb, x) do { } while (0) #define __pud_free_tlb(tlb, x) do { } while (0)
/* /*
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#undef pud_free_tlb #undef pud_free_tlb
#define pud_free_tlb(tlb, x) do { } while (0) #define pud_free_tlb(tlb, x) do { } while (0)
#define pud_free(x) do { } while (0) #define pud_free(mm, x) do { } while (0)
#define __pud_free_tlb(tlb, x) do { } while (0) #define __pud_free_tlb(tlb, x) do { } while (0)
#undef pud_addr_end #undef pud_addr_end
......
...@@ -54,7 +54,7 @@ static inline pmd_t * pmd_offset(pud_t * pud, unsigned long address) ...@@ -54,7 +54,7 @@ static inline pmd_t * pmd_offset(pud_t * pud, unsigned long address)
* inside the pud, so has no extra memory associated with it. * inside the pud, so has no extra memory associated with it.
*/ */
#define pmd_alloc_one(mm, address) NULL #define pmd_alloc_one(mm, address) NULL
#define pmd_free(x) do { } while (0) #define pmd_free(mm, x) do { } while (0)
#define __pmd_free_tlb(tlb, x) do { } while (0) #define __pmd_free_tlb(tlb, x) do { } while (0)
#undef pmd_addr_end #undef pmd_addr_end
......
...@@ -51,7 +51,7 @@ static inline pud_t * pud_offset(pgd_t * pgd, unsigned long address) ...@@ -51,7 +51,7 @@ static inline pud_t * pud_offset(pgd_t * pgd, unsigned long address)
* inside the pgd, so has no extra memory associated with it. * inside the pgd, so has no extra memory associated with it.
*/ */
#define pud_alloc_one(mm, address) NULL #define pud_alloc_one(mm, address) NULL
#define pud_free(x) do { } while (0) #define pud_free(mm, x) do { } while (0)
#define __pud_free_tlb(tlb, x) do { } while (0) #define __pud_free_tlb(tlb, x) do { } while (0)
#undef pud_addr_end #undef pud_addr_end
......
...@@ -27,7 +27,7 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm) ...@@ -27,7 +27,7 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm)
return quicklist_alloc(0, GFP_KERNEL, NULL); return quicklist_alloc(0, GFP_KERNEL, NULL);
} }
static inline void pgd_free(pgd_t * pgd) static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
{ {
quicklist_free(0, NULL, pgd); quicklist_free(0, NULL, pgd);
} }
...@@ -44,11 +44,11 @@ static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr) ...@@ -44,11 +44,11 @@ static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
return quicklist_alloc(0, GFP_KERNEL, NULL); return quicklist_alloc(0, GFP_KERNEL, NULL);
} }
static inline void pud_free(pud_t * pud) static inline void pud_free(struct mm_struct *mm, pud_t *pud)
{ {
quicklist_free(0, NULL, pud); quicklist_free(0, NULL, pud);
} }
#define __pud_free_tlb(tlb, pud) pud_free(pud) #define __pud_free_tlb(tlb, pud) pud_free((tlb)->mm, pud)
#endif /* CONFIG_PGTABLE_4 */ #endif /* CONFIG_PGTABLE_4 */
static inline void static inline void
...@@ -62,12 +62,12 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr) ...@@ -62,12 +62,12 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
return quicklist_alloc(0, GFP_KERNEL, NULL); return quicklist_alloc(0, GFP_KERNEL, NULL);
} }
static inline void pmd_free(pmd_t * pmd) static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
{ {
quicklist_free(0, NULL, pmd); quicklist_free(0, NULL, pmd);
} }
#define __pmd_free_tlb(tlb, pmd) pmd_free(pmd) #define __pmd_free_tlb(tlb, pmd) pmd_free((tlb)->mm, pmd)
static inline void static inline void
pmd_populate(struct mm_struct *mm, pmd_t * pmd_entry, struct page *pte) pmd_populate(struct mm_struct *mm, pmd_t * pmd_entry, struct page *pte)
...@@ -94,12 +94,12 @@ static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm, ...@@ -94,12 +94,12 @@ static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
return quicklist_alloc(0, GFP_KERNEL, NULL); return quicklist_alloc(0, GFP_KERNEL, NULL);
} }
static inline void pte_free(struct page *pte) static inline void pte_free(struct mm_struct *mm, struct page *pte)
{ {
quicklist_free_page(0, NULL, pte); quicklist_free_page(0, NULL, pte);
} }
static inline void pte_free_kernel(pte_t * pte) static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
{ {
quicklist_free(0, NULL, pte); quicklist_free(0, NULL, pte);
} }
...@@ -109,6 +109,6 @@ static inline void check_pgt_cache(void) ...@@ -109,6 +109,6 @@ static inline void check_pgt_cache(void)
quicklist_trim(0, NULL, 25, 16); quicklist_trim(0, NULL, 25, 16);
} }
#define __pte_free_tlb(tlb, pte) pte_free(pte) #define __pte_free_tlb(tlb, pte) pte_free((tlb)->mm, pte)
#endif /* _ASM_IA64_PGALLOC_H */ #endif /* _ASM_IA64_PGALLOC_H */
...@@ -24,7 +24,7 @@ static __inline__ pgd_t *pgd_alloc(struct mm_struct *mm) ...@@ -24,7 +24,7 @@ static __inline__ pgd_t *pgd_alloc(struct mm_struct *mm)
return pgd; return pgd;
} }
static __inline__ void pgd_free(pgd_t *pgd) static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
{ {
free_page((unsigned long)pgd); free_page((unsigned long)pgd);
} }
...@@ -46,17 +46,17 @@ static __inline__ struct page *pte_alloc_one(struct mm_struct *mm, ...@@ -46,17 +46,17 @@ static __inline__ struct page *pte_alloc_one(struct mm_struct *mm,
return pte; return pte;
} }
static __inline__ void pte_free_kernel(pte_t *pte) static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
{ {
free_page((unsigned long)pte); free_page((unsigned long)pte);
} }
static __inline__ void pte_free(struct page *pte) static inline void pte_free(struct mm_struct *mm, struct page *pte)
{ {
__free_page(pte); __free_page(pte);
} }
#define __pte_free_tlb(tlb, pte) pte_free((pte)) #define __pte_free_tlb(tlb, pte) pte_free((tlb)->mm, (pte))
/* /*
* allocating and freeing a pmd is trivial: the 1-entry pmd is * allocating and freeing a pmd is trivial: the 1-entry pmd is
...@@ -65,7 +65,7 @@ static __inline__ void pte_free(struct page *pte) ...@@ -65,7 +65,7 @@ static __inline__ void pte_free(struct page *pte)
*/ */
#define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *)2); }) #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *)2); })
#define pmd_free(x) do { } while (0) #define pmd_free(mm, x) do { } while (0)
#define __pmd_free_tlb(tlb, x) do { } while (0) #define __pmd_free_tlb(tlb, x) do { } while (0)
#define pgd_populate(mm, pmd, pte) BUG() #define pgd_populate(mm, pmd, pte) BUG()
......
...@@ -22,7 +22,7 @@ static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long ad ...@@ -22,7 +22,7 @@ static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long ad
return pte; return pte;
} }
static inline void pte_free_kernel(pte_t *pte) static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
{ {
cache_page(pte); cache_page(pte);
free_page((unsigned long) pte); free_page((unsigned long) pte);
...@@ -47,7 +47,7 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm, unsigned long add ...@@ -47,7 +47,7 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm, unsigned long add
return page; return page;
} }
static inline void pte_free(struct page *page) static inline void pte_free(struct mm_struct *mm, struct page *page)
{ {
cache_page(kmap(page)); cache_page(kmap(page));
kunmap(page); kunmap(page);
...@@ -67,7 +67,7 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address) ...@@ -67,7 +67,7 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
return get_pointer_table(); return get_pointer_table();
} }
static inline int pmd_free(pmd_t *pmd) static inline int pmd_free(struct mm_struct *mm, pmd_t *pmd)
{ {
return free_pointer_table(pmd); return free_pointer_table(pmd);
} }
...@@ -78,9 +78,9 @@ static inline int __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd) ...@@ -78,9 +78,9 @@ static inline int __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd)
} }
static inline void pgd_free(pgd_t *pgd) static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
{ {
pmd_free((pmd_t *)pgd); pmd_free(mm, (pmd_t *)pgd);
} }
static inline pgd_t *pgd_alloc(struct mm_struct *mm) static inline pgd_t *pgd_alloc(struct mm_struct *mm)
......
...@@ -21,12 +21,12 @@ extern const char bad_pmd_string[]; ...@@ -21,12 +21,12 @@ extern const char bad_pmd_string[];
#define pmd_alloc_one(mm,address) ({ BUG(); ((pmd_t *)2); }) #define pmd_alloc_one(mm,address) ({ BUG(); ((pmd_t *)2); })
static inline void pte_free_kernel(pte_t * pte) static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
{ {
free_page((unsigned long) pte); free_page((unsigned long) pte);
} }
static inline void pte_free(struct page *page) static inline void pte_free(struct mm_struct *mm, struct page *page)
{ {
__free_page(page); __free_page(page);
} }
...@@ -72,10 +72,10 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, struct page *p ...@@ -72,10 +72,10 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, struct page *p
* allocating and freeing a pmd is trivial: the 1-entry pmd is * allocating and freeing a pmd is trivial: the 1-entry pmd is
* inside the pgd, so has no extra memory associated with it. * inside the pgd, so has no extra memory associated with it.
*/ */
#define pmd_free(x) do { } while (0) #define pmd_free(mm, x) do { } while (0)
#define __pmd_free_tlb(tlb, x) do { } while (0) #define __pmd_free_tlb(tlb, x) do { } while (0)
static inline void pgd_free(pgd_t * pgd) static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
{ {
free_page((unsigned long) pgd); free_page((unsigned long) pgd);
} }
......
...@@ -58,7 +58,7 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm) ...@@ -58,7 +58,7 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm)
return ret; return ret;
} }
static inline void pgd_free(pgd_t *pgd) static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
{ {
free_pages((unsigned long)pgd, PGD_ORDER); free_pages((unsigned long)pgd, PGD_ORDER);
} }
...@@ -85,12 +85,12 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm, ...@@ -85,12 +85,12 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm,
return pte; return pte;
} }
static inline void pte_free_kernel(pte_t *pte) static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
{ {
free_pages((unsigned long)pte, PTE_ORDER); free_pages((unsigned long)pte, PTE_ORDER);
} }
static inline void pte_free(struct page *pte) static inline void pte_free(struct mm_struct *mm, struct page *pte)
{ {
__free_pages(pte, PTE_ORDER); __free_pages(pte, PTE_ORDER);
} }
...@@ -103,7 +103,7 @@ static inline void pte_free(struct page *pte) ...@@ -103,7 +103,7 @@ static inline void pte_free(struct page *pte)
* allocating and freeing a pmd is trivial: the 1-entry pmd is * allocating and freeing a pmd is trivial: the 1-entry pmd is
* inside the pgd, so has no extra memory associated with it. * inside the pgd, so has no extra memory associated with it.
*/ */
#define pmd_free(x) do { } while (0) #define pmd_free(mm, x) do { } while (0)
#define __pmd_free_tlb(tlb, x) do { } while (0) #define __pmd_free_tlb(tlb, x) do { } while (0)
#endif #endif
...@@ -120,12 +120,12 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address) ...@@ -120,12 +120,12 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
return pmd; return pmd;
} }
static inline void pmd_free(pmd_t *pmd) static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
{ {
free_pages((unsigned long)pmd, PMD_ORDER); free_pages((unsigned long)pmd, PMD_ORDER);
} }
#define __pmd_free_tlb(tlb, x) pmd_free(x) #define __pmd_free_tlb(tlb, x) pmd_free((tlb)->mm, x)
#endif #endif
......
...@@ -43,7 +43,7 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm) ...@@ -43,7 +43,7 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm)
return actual_pgd; return actual_pgd;
} }
static inline void pgd_free(pgd_t *pgd) static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
{ {
#ifdef CONFIG_64BIT #ifdef CONFIG_64BIT
pgd -= PTRS_PER_PGD; pgd -= PTRS_PER_PGD;
...@@ -70,7 +70,7 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address) ...@@ -70,7 +70,7 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
return pmd; return pmd;
} }
static inline void pmd_free(pmd_t *pmd) static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
{ {
#ifdef CONFIG_64BIT #ifdef CONFIG_64BIT
if(pmd_flag(*pmd) & PxD_FLAG_ATTACHED) if(pmd_flag(*pmd) & PxD_FLAG_ATTACHED)
...@@ -91,7 +91,7 @@ static inline void pmd_free(pmd_t *pmd) ...@@ -91,7 +91,7 @@ static inline void pmd_free(pmd_t *pmd)
*/ */
#define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *)2); }) #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *)2); })
#define pmd_free(x) do { } while (0) #define pmd_free(mm, x) do { } while (0)
#define pgd_populate(mm, pmd, pte) BUG() #define pgd_populate(mm, pmd, pte) BUG()
#endif #endif
...@@ -130,12 +130,12 @@ pte_alloc_one_kernel(struct mm_struct *mm, unsigned long addr) ...@@ -130,12 +130,12 @@ pte_alloc_one_kernel(struct mm_struct *mm, unsigned long addr)
return pte; return pte;
} }
static inline void pte_free_kernel(pte_t *pte) static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
{ {
free_page((unsigned long)pte); free_page((unsigned long)pte);
} }
#define pte_free(page) pte_free_kernel(page_address(page)) #define pte_free(mm, page) pte_free_kernel(page_address(page))
#define check_pgt_cache() do { } while (0) #define check_pgt_cache() do { } while (0)
......
...@@ -21,7 +21,7 @@ do { if (!(tlb)->fullmm) \ ...@@ -21,7 +21,7 @@ do { if (!(tlb)->fullmm) \
#include <asm-generic/tlb.h> #include <asm-generic/tlb.h>
#define __pmd_free_tlb(tlb, pmd) pmd_free(pmd) #define __pmd_free_tlb(tlb, pmd) pmd_free((tlb)->mm, pmd)
#define __pte_free_tlb(tlb, pte) pte_free(pte) #define __pte_free_tlb(tlb, pte) pte_free((tlb)->mm, pte)
#endif #endif
...@@ -6,14 +6,14 @@ ...@@ -6,14 +6,14 @@
extern void __bad_pte(pmd_t *pmd); extern void __bad_pte(pmd_t *pmd);
extern pgd_t *pgd_alloc(struct mm_struct *mm); extern pgd_t *pgd_alloc(struct mm_struct *mm);
extern void pgd_free(pgd_t *pgd); extern void pgd_free(struct mm_struct *mm, pgd_t *pgd);
/* /*
* We don't have any real pmd's, and this code never triggers because * We don't have any real pmd's, and this code never triggers because
* the pgd will always be present.. * the pgd will always be present..
*/ */
/* #define pmd_alloc_one(mm,address) ({ BUG(); ((pmd_t *)2); }) */ /* #define pmd_alloc_one(mm,address) ({ BUG(); ((pmd_t *)2); }) */
#define pmd_free(x) do { } while (0) #define pmd_free(mm, x) do { } while (0)
#define __pmd_free_tlb(tlb,x) do { } while (0) #define __pmd_free_tlb(tlb,x) do { } while (0)
/* #define pgd_populate(mm, pmd, pte) BUG() */ /* #define pgd_populate(mm, pmd, pte) BUG() */
...@@ -31,10 +31,10 @@ extern void pgd_free(pgd_t *pgd); ...@@ -31,10 +31,10 @@ extern void pgd_free(pgd_t *pgd);
extern pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long addr); extern pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long addr);
extern struct page *pte_alloc_one(struct mm_struct *mm, unsigned long addr); extern struct page *pte_alloc_one(struct mm_struct *mm, unsigned long addr);
extern void pte_free_kernel(pte_t *pte); extern void pte_free_kernel(struct mm_struct *mm, pte_t *pte);
extern void pte_free(struct page *pte); extern void pte_free(struct mm_struct *mm, struct page *pte);
#define __pte_free_tlb(tlb, pte) pte_free((pte)) #define __pte_free_tlb(tlb, pte) pte_free((tlb)->mm, (pte))
#define check_pgt_cache() do { } while (0) #define check_pgt_cache() do { } while (0)
......
...@@ -29,7 +29,7 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm) ...@@ -29,7 +29,7 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm)
return kmem_cache_alloc(pgtable_cache[PGD_CACHE_NUM], GFP_KERNEL); return kmem_cache_alloc(pgtable_cache[PGD_CACHE_NUM], GFP_KERNEL);
} }
static inline void pgd_free(pgd_t *pgd) static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
{ {
subpage_prot_free(pgd); subpage_prot_free(pgd);
kmem_cache_free(pgtable_cache[PGD_CACHE_NUM], pgd); kmem_cache_free(pgtable_cache[PGD_CACHE_NUM], pgd);
...@@ -45,7 +45,7 @@ static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr) ...@@ -45,7 +45,7 @@ static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
GFP_KERNEL|__GFP_REPEAT); GFP_KERNEL|__GFP_REPEAT);
} }
static inline void pud_free(pud_t *pud) static inline void pud_free(struct mm_struct *mm, pud_t *pud)
{ {
kmem_cache_free(pgtable_cache[PUD_CACHE_NUM], pud); kmem_cache_free(pgtable_cache[PUD_CACHE_NUM], pud);
} }
...@@ -81,7 +81,7 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr) ...@@ -81,7 +81,7 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
GFP_KERNEL|__GFP_REPEAT); GFP_KERNEL|__GFP_REPEAT);
} }
static inline void pmd_free(pmd_t *pmd) static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
{ {
kmem_cache_free(pgtable_cache[PMD_CACHE_NUM], pmd); kmem_cache_free(pgtable_cache[PMD_CACHE_NUM], pmd);
} }
...@@ -99,12 +99,12 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm, ...@@ -99,12 +99,12 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm,
return pte ? virt_to_page(pte) : NULL; return pte ? virt_to_page(pte) : NULL;
} }
static inline void pte_free_kernel(pte_t *pte) static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
{ {
free_page((unsigned long)pte); free_page((unsigned long)pte);
} }
static inline void pte_free(struct page *ptepage) static inline void pte_free(struct mm_struct *mm, struct page *ptepage)
{ {
__free_page(ptepage); __free_page(ptepage);
} }
......
...@@ -7,14 +7,14 @@ ...@@ -7,14 +7,14 @@
extern void __bad_pte(pmd_t *pmd); extern void __bad_pte(pmd_t *pmd);
extern pgd_t *pgd_alloc(struct mm_struct *mm); extern pgd_t *pgd_alloc(struct mm_struct *mm);
extern void pgd_free(pgd_t *pgd); extern void pgd_free(struct mm_struct *mm, pgd_t *pgd);
/* /*
* We don't have any real pmd's, and this code never triggers because * We don't have any real pmd's, and this code never triggers because
* the pgd will always be present.. * the pgd will always be present..
*/ */
#define pmd_alloc_one(mm,address) ({ BUG(); ((pmd_t *)2); }) #define pmd_alloc_one(mm,address) ({ BUG(); ((pmd_t *)2); })
#define pmd_free(x) do { } while (0) #define pmd_free(mm, x) do { } while (0)
#define __pmd_free_tlb(tlb,x) do { } while (0) #define __pmd_free_tlb(tlb,x) do { } while (0)
#define pgd_populate(mm, pmd, pte) BUG() #define pgd_populate(mm, pmd, pte) BUG()
...@@ -32,10 +32,10 @@ extern void pgd_free(pgd_t *pgd); ...@@ -32,10 +32,10 @@ extern void pgd_free(pgd_t *pgd);
extern pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long addr); extern pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long addr);
extern struct page *pte_alloc_one(struct mm_struct *mm, unsigned long addr); extern struct page *pte_alloc_one(struct mm_struct *mm, unsigned long addr);
extern void pte_free_kernel(pte_t *pte); extern void pte_free_kernel(struct mm_struct *mm, pte_t *pte);
extern void pte_free(struct page *pte); extern void pte_free(struct mm_struct *mm, struct page *pte);
#define __pte_free_tlb(tlb, pte) pte_free((pte)) #define __pte_free_tlb(tlb, pte) pte_free((tlb)->mm, (pte))
#define check_pgt_cache() do { } while (0) #define check_pgt_cache() do { } while (0)
......
...@@ -57,10 +57,10 @@ static inline unsigned long pgd_entry_type(struct mm_struct *mm) ...@@ -57,10 +57,10 @@ static inline unsigned long pgd_entry_type(struct mm_struct *mm)
} }
#define pud_alloc_one(mm,address) ({ BUG(); ((pud_t *)2); }) #define pud_alloc_one(mm,address) ({ BUG(); ((pud_t *)2); })
#define pud_free(x) do { } while (0) #define pud_free(mm, x) do { } while (0)
#define pmd_alloc_one(mm,address) ({ BUG(); ((pmd_t *)2); }) #define pmd_alloc_one(mm,address) ({ BUG(); ((pmd_t *)2); })
#define pmd_free(x) do { } while (0) #define pmd_free(mm, x) do { } while (0)
#define pgd_populate(mm, pgd, pud) BUG() #define pgd_populate(mm, pgd, pud) BUG()
#define pgd_populate_kernel(mm, pgd, pud) BUG() #define pgd_populate_kernel(mm, pgd, pud) BUG()
...@@ -76,7 +76,7 @@ static inline unsigned long pgd_entry_type(struct mm_struct *mm) ...@@ -76,7 +76,7 @@ static inline unsigned long pgd_entry_type(struct mm_struct *mm)
} }
#define pud_alloc_one(mm,address) ({ BUG(); ((pud_t *)2); }) #define pud_alloc_one(mm,address) ({ BUG(); ((pud_t *)2); })
#define pud_free(x) do { } while (0) #define pud_free(mm, x) do { } while (0)
static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long vmaddr) static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long vmaddr)
{ {
...@@ -85,7 +85,7 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long vmaddr) ...@@ -85,7 +85,7 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long vmaddr)
crst_table_init(crst, _SEGMENT_ENTRY_EMPTY); crst_table_init(crst, _SEGMENT_ENTRY_EMPTY);
return (pmd_t *) crst; return (pmd_t *) crst;
} }
#define pmd_free(pmd) crst_table_free((unsigned long *) pmd) #define pmd_free(mm, pmd) crst_table_free((unsigned long *)pmd)
#define pgd_populate(mm, pgd, pud) BUG() #define pgd_populate(mm, pgd, pud) BUG()
#define pgd_populate_kernel(mm, pgd, pud) BUG() #define pgd_populate_kernel(mm, pgd, pud) BUG()
...@@ -115,7 +115,7 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm) ...@@ -115,7 +115,7 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm)
crst_table_init(crst, pgd_entry_type(mm)); crst_table_init(crst, pgd_entry_type(mm));
return (pgd_t *) crst; return (pgd_t *) crst;
} }
#define pgd_free(pgd) crst_table_free((unsigned long *) pgd) #define pgd_free(mm, pgd) crst_table_free((unsigned long *) pgd)
static inline void static inline void
pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd, pte_t *pte) pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd, pte_t *pte)
...@@ -151,9 +151,9 @@ pmd_populate(struct mm_struct *mm, pmd_t *pmd, struct page *page) ...@@ -151,9 +151,9 @@ pmd_populate(struct mm_struct *mm, pmd_t *pmd, struct page *page)
#define pte_alloc_one(mm, vmaddr) \ #define pte_alloc_one(mm, vmaddr) \
virt_to_page(page_table_alloc(s390_noexec)) virt_to_page(page_table_alloc(s390_noexec))
#define pte_free_kernel(pte) \ #define pte_free_kernel(mm, pte) \
page_table_free((unsigned long *) pte) page_table_free((unsigned long *) pte)
#define pte_free(pte) \ #define pte_free(mm, pte) \
page_table_free((unsigned long *) page_to_phys((struct page *) pte)) page_table_free((unsigned long *) page_to_phys((struct page *) pte))
#endif /* _S390_PGALLOC_H */ #endif /* _S390_PGALLOC_H */
...@@ -65,9 +65,9 @@ static inline void tlb_flush_mmu(struct mmu_gather *tlb, ...@@ -65,9 +65,9 @@ static inline void tlb_flush_mmu(struct mmu_gather *tlb,
if (!tlb->fullmm && (tlb->nr_ptes > 0 || tlb->nr_pmds < TLB_NR_PTRS)) if (!tlb->fullmm && (tlb->nr_ptes > 0 || tlb->nr_pmds < TLB_NR_PTRS))
__tlb_flush_mm(tlb->mm); __tlb_flush_mm(tlb->mm);
while (tlb->nr_ptes > 0) while (tlb->nr_ptes > 0)
pte_free(tlb->array[--tlb->nr_ptes]); pte_free(tlb->mm, tlb->array[--tlb->nr_ptes]);
while (tlb->nr_pmds < TLB_NR_PTRS) while (tlb->nr_pmds < TLB_NR_PTRS)
pmd_free((pmd_t *) tlb->array[tlb->nr_pmds++]); pmd_free(tlb->mm, (pmd_t *) tlb->array[tlb->nr_pmds++]);
} }
static inline void tlb_finish_mmu(struct mmu_gather *tlb, static inline void tlb_finish_mmu(struct mmu_gather *tlb,
...@@ -102,7 +102,7 @@ static inline void pte_free_tlb(struct mmu_gather *tlb, struct page *page) ...@@ -102,7 +102,7 @@ static inline void pte_free_tlb(struct mmu_gather *tlb, struct page *page)
if (tlb->nr_ptes >= tlb->nr_pmds) if (tlb->nr_ptes >= tlb->nr_pmds)
tlb_flush_mmu(tlb, 0, 0); tlb_flush_mmu(tlb, 0, 0);
} else } else
pte_free(page); pte_free(tlb->mm, page);
} }
/* /*
...@@ -117,7 +117,7 @@ static inline void pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd) ...@@ -117,7 +117,7 @@ static inline void pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd)
if (tlb->nr_ptes >= tlb->nr_pmds) if (tlb->nr_ptes >= tlb->nr_pmds)
tlb_flush_mmu(tlb, 0, 0); tlb_flush_mmu(tlb, 0, 0);
} else } else
pmd_free(pmd); pmd_free(tlb->mm, pmd);
#endif #endif
} }
......
...@@ -36,7 +36,7 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm) ...@@ -36,7 +36,7 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm)
return quicklist_alloc(QUICK_PGD, GFP_KERNEL | __GFP_REPEAT, pgd_ctor); return quicklist_alloc(QUICK_PGD, GFP_KERNEL | __GFP_REPEAT, pgd_ctor);
} }
static inline void pgd_free(pgd_t *pgd) static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
{ {
quicklist_free(QUICK_PGD, NULL, pgd); quicklist_free(QUICK_PGD, NULL, pgd);
} }
...@@ -54,12 +54,12 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm, ...@@ -54,12 +54,12 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm,
return pg ? virt_to_page(pg) : NULL; return pg ? virt_to_page(pg) : NULL;
} }
static inline void pte_free_kernel(pte_t *pte) static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
{ {
quicklist_free(QUICK_PT, NULL, pte); quicklist_free(QUICK_PT, NULL, pte);
} }
static inline void pte_free(struct page *pte) static inline void pte_free(struct mm_struct *mm, struct page *pte)
{ {
quicklist_free_page(QUICK_PT, NULL, pte); quicklist_free_page(QUICK_PT, NULL, pte);
} }
...@@ -71,7 +71,7 @@ static inline void pte_free(struct page *pte) ...@@ -71,7 +71,7 @@ static inline void pte_free(struct page *pte)
* inside the pgd, so has no extra memory associated with it. * inside the pgd, so has no extra memory associated with it.
*/ */
#define pmd_free(x) do { } while (0) #define pmd_free(mm, x) do { } while (0)
#define __pmd_free_tlb(tlb,x) do { } while (0) #define __pmd_free_tlb(tlb,x) do { } while (0)
static inline void check_pgt_cache(void) static inline void check_pgt_cache(void)
......
...@@ -32,7 +32,7 @@ BTFIXUPDEF_CALL(pgd_t *, get_pgd_fast, void) ...@@ -32,7 +32,7 @@ BTFIXUPDEF_CALL(pgd_t *, get_pgd_fast, void)
BTFIXUPDEF_CALL(void, free_pgd_fast, pgd_t *) BTFIXUPDEF_CALL(void, free_pgd_fast, pgd_t *)
#define free_pgd_fast(pgd) BTFIXUP_CALL(free_pgd_fast)(pgd) #define free_pgd_fast(pgd) BTFIXUP_CALL(free_pgd_fast)(pgd)
#define pgd_free(pgd) free_pgd_fast(pgd) #define pgd_free(mm, pgd) free_pgd_fast(pgd)
#define pgd_alloc(mm) get_pgd_fast() #define pgd_alloc(mm) get_pgd_fast()
BTFIXUPDEF_CALL(void, pgd_set, pgd_t *, pmd_t *) BTFIXUPDEF_CALL(void, pgd_set, pgd_t *, pmd_t *)
...@@ -45,8 +45,8 @@ BTFIXUPDEF_CALL(pmd_t *, pmd_alloc_one, struct mm_struct *, unsigned long) ...@@ -45,8 +45,8 @@ BTFIXUPDEF_CALL(pmd_t *, pmd_alloc_one, struct mm_struct *, unsigned long)
BTFIXUPDEF_CALL(void, free_pmd_fast, pmd_t *) BTFIXUPDEF_CALL(void, free_pmd_fast, pmd_t *)
#define free_pmd_fast(pmd) BTFIXUP_CALL(free_pmd_fast)(pmd) #define free_pmd_fast(pmd) BTFIXUP_CALL(free_pmd_fast)(pmd)
#define pmd_free(pmd) free_pmd_fast(pmd) #define pmd_free(mm, pmd) free_pmd_fast(pmd)
#define __pmd_free_tlb(tlb, pmd) pmd_free(pmd) #define __pmd_free_tlb(tlb, pmd) pmd_free((tlb)->mm, pmd)
BTFIXUPDEF_CALL(void, pmd_populate, pmd_t *, struct page *) BTFIXUPDEF_CALL(void, pmd_populate, pmd_t *, struct page *)
#define pmd_populate(MM, PMD, PTE) BTFIXUP_CALL(pmd_populate)(PMD, PTE) #define pmd_populate(MM, PMD, PTE) BTFIXUP_CALL(pmd_populate)(PMD, PTE)
...@@ -59,10 +59,10 @@ BTFIXUPDEF_CALL(pte_t *, pte_alloc_one_kernel, struct mm_struct *, unsigned long ...@@ -59,10 +59,10 @@ BTFIXUPDEF_CALL(pte_t *, pte_alloc_one_kernel, struct mm_struct *, unsigned long
#define pte_alloc_one_kernel(mm, addr) BTFIXUP_CALL(pte_alloc_one_kernel)(mm, addr) #define pte_alloc_one_kernel(mm, addr) BTFIXUP_CALL(pte_alloc_one_kernel)(mm, addr)
BTFIXUPDEF_CALL(void, free_pte_fast, pte_t *) BTFIXUPDEF_CALL(void, free_pte_fast, pte_t *)
#define pte_free_kernel(pte) BTFIXUP_CALL(free_pte_fast)(pte) #define pte_free_kernel(mm, pte) BTFIXUP_CALL(free_pte_fast)(pte)
BTFIXUPDEF_CALL(void, pte_free, struct page *) BTFIXUPDEF_CALL(void, pte_free, struct page *)
#define pte_free(pte) BTFIXUP_CALL(pte_free)(pte) #define pte_free(mm, pte) BTFIXUP_CALL(pte_free)(pte)
#define __pte_free_tlb(tlb, pte) pte_free(pte) #define __pte_free_tlb(tlb, pte) pte_free((tlb)->mm, pte)
#endif /* _SPARC_PGALLOC_H */ #endif /* _SPARC_PGALLOC_H */
...@@ -20,7 +20,7 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm) ...@@ -20,7 +20,7 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm)
return quicklist_alloc(0, GFP_KERNEL, NULL); return quicklist_alloc(0, GFP_KERNEL, NULL);
} }
static inline void pgd_free(pgd_t *pgd) static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
{ {
quicklist_free(0, NULL, pgd); quicklist_free(0, NULL, pgd);
} }
...@@ -32,7 +32,7 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr) ...@@ -32,7 +32,7 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
return quicklist_alloc(0, GFP_KERNEL, NULL); return quicklist_alloc(0, GFP_KERNEL, NULL);
} }
static inline void pmd_free(pmd_t *pmd) static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
{ {
quicklist_free(0, NULL, pmd); quicklist_free(0, NULL, pmd);
} }
...@@ -50,12 +50,12 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm, ...@@ -50,12 +50,12 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm,
return pg ? virt_to_page(pg) : NULL; return pg ? virt_to_page(pg) : NULL;
} }
static inline void pte_free_kernel(pte_t *pte) static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
{ {
quicklist_free(0, NULL, pte); quicklist_free(0, NULL, pte);
} }
static inline void pte_free(struct page *ptepage) static inline void pte_free(struct mm_struct *mm, struct page *ptepage)
{ {
quicklist_free_page(0, NULL, ptepage); quicklist_free_page(0, NULL, ptepage);
} }
......
...@@ -100,8 +100,8 @@ static inline void tlb_remove_page(struct mmu_gather *mp, struct page *page) ...@@ -100,8 +100,8 @@ static inline void tlb_remove_page(struct mmu_gather *mp, struct page *page)
} }
#define tlb_remove_tlb_entry(mp,ptep,addr) do { } while (0) #define tlb_remove_tlb_entry(mp,ptep,addr) do { } while (0)
#define pte_free_tlb(mp,ptepage) pte_free(ptepage) #define pte_free_tlb(mp, ptepage) pte_free((mp)->mm, ptepage)
#define pmd_free_tlb(mp,pmdp) pmd_free(pmdp) #define pmd_free_tlb(mp, pmdp) pmd_free((mp)->mm, pmdp)
#define pud_free_tlb(tlb,pudp) __pud_free_tlb(tlb,pudp) #define pud_free_tlb(tlb,pudp) __pud_free_tlb(tlb,pudp)
#define tlb_migrate_finish(mm) do { } while (0) #define tlb_migrate_finish(mm) do { } while (0)
......
...@@ -23,17 +23,17 @@ ...@@ -23,17 +23,17 @@
* Allocate and free page tables. * Allocate and free page tables.
*/ */
extern pgd_t *pgd_alloc(struct mm_struct *); extern pgd_t *pgd_alloc(struct mm_struct *);
extern void pgd_free(pgd_t *pgd); extern void pgd_free(struct mm_struct *mm, pgd_t *pgd);
extern pte_t *pte_alloc_one_kernel(struct mm_struct *, unsigned long); extern pte_t *pte_alloc_one_kernel(struct mm_struct *, unsigned long);
extern struct page *pte_alloc_one(struct mm_struct *, unsigned long); extern struct page *pte_alloc_one(struct mm_struct *, unsigned long);
static inline void pte_free_kernel(pte_t *pte) static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
{ {
free_page((unsigned long) pte); free_page((unsigned long) pte);
} }
static inline void pte_free(struct page *pte) static inline void pte_free(struct mm_struct *mm, struct page *pte)
{ {
__free_page(pte); __free_page(pte);
} }
...@@ -42,7 +42,7 @@ static inline void pte_free(struct page *pte) ...@@ -42,7 +42,7 @@ static inline void pte_free(struct page *pte)
#ifdef CONFIG_3_LEVEL_PGTABLES #ifdef CONFIG_3_LEVEL_PGTABLES
static inline void pmd_free(pmd_t *pmd) static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
{ {
free_page((unsigned long)pmd); free_page((unsigned long)pmd);
} }
......
...@@ -36,17 +36,17 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, struct page *p ...@@ -36,17 +36,17 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, struct page *p
* Allocate and free page tables. * Allocate and free page tables.
*/ */
extern pgd_t *pgd_alloc(struct mm_struct *); extern pgd_t *pgd_alloc(struct mm_struct *);
extern void pgd_free(pgd_t *pgd); extern void pgd_free(struct mm_struct *mm, pgd_t *pgd);
extern pte_t *pte_alloc_one_kernel(struct mm_struct *, unsigned long); extern pte_t *pte_alloc_one_kernel(struct mm_struct *, unsigned long);
extern struct page *pte_alloc_one(struct mm_struct *, unsigned long); extern struct page *pte_alloc_one(struct mm_struct *, unsigned long);
static inline void pte_free_kernel(pte_t *pte) static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
{ {
free_page((unsigned long)pte); free_page((unsigned long)pte);
} }
static inline void pte_free(struct page *pte) static inline void pte_free(struct mm_struct *mm, struct page *pte)
{ {
__free_page(pte); __free_page(pte);
} }
...@@ -63,7 +63,7 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr) ...@@ -63,7 +63,7 @@ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
return (pmd_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT); return (pmd_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
} }
static inline void pmd_free(pmd_t *pmd) static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
{ {
BUG_ON((unsigned long)pmd & (PAGE_SIZE-1)); BUG_ON((unsigned long)pmd & (PAGE_SIZE-1));
free_page((unsigned long)pmd); free_page((unsigned long)pmd);
......
...@@ -17,7 +17,7 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, struct page *p ...@@ -17,7 +17,7 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, struct page *p
set_pmd(pmd, __pmd(_PAGE_TABLE | (page_to_pfn(pte) << PAGE_SHIFT))); set_pmd(pmd, __pmd(_PAGE_TABLE | (page_to_pfn(pte) << PAGE_SHIFT)));
} }
static inline void pmd_free(pmd_t *pmd) static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
{ {
BUG_ON((unsigned long)pmd & (PAGE_SIZE-1)); BUG_ON((unsigned long)pmd & (PAGE_SIZE-1));
free_page((unsigned long)pmd); free_page((unsigned long)pmd);
...@@ -33,7 +33,7 @@ static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr) ...@@ -33,7 +33,7 @@ static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT); return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
} }
static inline void pud_free (pud_t *pud) static inline void pud_free(struct mm_struct *mm, pud_t *pud)
{ {
BUG_ON((unsigned long)pud & (PAGE_SIZE-1)); BUG_ON((unsigned long)pud & (PAGE_SIZE-1));
free_page((unsigned long)pud); free_page((unsigned long)pud);
...@@ -77,7 +77,7 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm) ...@@ -77,7 +77,7 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm)
return pgd; return pgd;
} }
static inline void pgd_free(pgd_t *pgd) static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
{ {
BUG_ON((unsigned long)pgd & (PAGE_SIZE-1)); BUG_ON((unsigned long)pgd & (PAGE_SIZE-1));
pgd_list_del(pgd); pgd_list_del(pgd);
...@@ -100,13 +100,13 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm, unsigned long add ...@@ -100,13 +100,13 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm, unsigned long add
/* Should really implement gc for free page table pages. This could be /* Should really implement gc for free page table pages. This could be
done with a reference count in struct page. */ done with a reference count in struct page. */
static inline void pte_free_kernel(pte_t *pte) static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
{ {
BUG_ON((unsigned long)pte & (PAGE_SIZE-1)); BUG_ON((unsigned long)pte & (PAGE_SIZE-1));
free_page((unsigned long)pte); free_page((unsigned long)pte);
} }
static inline void pte_free(struct page *pte) static inline void pte_free(struct mm_struct *mm, struct page *pte)
{ {
__free_page(pte); __free_page(pte);
} }
......
...@@ -31,7 +31,7 @@ pgd_alloc(struct mm_struct *mm) ...@@ -31,7 +31,7 @@ pgd_alloc(struct mm_struct *mm)
return (pgd_t*) __get_free_pages(GFP_KERNEL | __GFP_ZERO, PGD_ORDER); return (pgd_t*) __get_free_pages(GFP_KERNEL | __GFP_ZERO, PGD_ORDER);
} }
static inline void pgd_free(pgd_t *pgd) static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
{ {
free_page((unsigned long)pgd); free_page((unsigned long)pgd);
} }
...@@ -52,12 +52,12 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm, ...@@ -52,12 +52,12 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm,
return virt_to_page(pte_alloc_one_kernel(mm, addr)); return virt_to_page(pte_alloc_one_kernel(mm, addr));
} }
static inline void pte_free_kernel(pte_t *pte) static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
{ {
kmem_cache_free(pgtable_cache, pte); kmem_cache_free(pgtable_cache, pte);
} }
static inline void pte_free(struct page *page) static inline void pte_free(struct mm_struct *mm, struct page *page)
{ {
kmem_cache_free(pgtable_cache, page_address(page)); kmem_cache_free(pgtable_cache, page_address(page));
} }
......
...@@ -42,6 +42,6 @@ ...@@ -42,6 +42,6 @@
#include <asm-generic/tlb.h> #include <asm-generic/tlb.h>
#define __pte_free_tlb(tlb,pte) pte_free(pte) #define __pte_free_tlb(tlb, pte) pte_free((tlb)->mm, pte)
#endif /* _XTENSA_TLB_H */ #endif /* _XTENSA_TLB_H */
...@@ -325,7 +325,7 @@ static inline int mm_alloc_pgd(struct mm_struct * mm) ...@@ -325,7 +325,7 @@ static inline int mm_alloc_pgd(struct mm_struct * mm)
static inline void mm_free_pgd(struct mm_struct * mm) static inline void mm_free_pgd(struct mm_struct * mm)
{ {
pgd_free(mm->pgd); pgd_free(mm, mm->pgd);
} }
#else #else
#define dup_mmap(mm, oldmm) (0) #define dup_mmap(mm, oldmm) (0)
......
...@@ -305,7 +305,7 @@ int __pte_alloc(struct mm_struct *mm, pmd_t *pmd, unsigned long address) ...@@ -305,7 +305,7 @@ int __pte_alloc(struct mm_struct *mm, pmd_t *pmd, unsigned long address)
spin_lock(&mm->page_table_lock); spin_lock(&mm->page_table_lock);
if (pmd_present(*pmd)) { /* Another has populated it */ if (pmd_present(*pmd)) { /* Another has populated it */
pte_lock_deinit(new); pte_lock_deinit(new);
pte_free(new); pte_free(mm, new);
} else { } else {
mm->nr_ptes++; mm->nr_ptes++;
inc_zone_page_state(new, NR_PAGETABLE); inc_zone_page_state(new, NR_PAGETABLE);
...@@ -323,7 +323,7 @@ int __pte_alloc_kernel(pmd_t *pmd, unsigned long address) ...@@ -323,7 +323,7 @@ int __pte_alloc_kernel(pmd_t *pmd, unsigned long address)
spin_lock(&init_mm.page_table_lock); spin_lock(&init_mm.page_table_lock);
if (pmd_present(*pmd)) /* Another has populated it */ if (pmd_present(*pmd)) /* Another has populated it */
pte_free_kernel(new); pte_free_kernel(&init_mm, new);
else else
pmd_populate_kernel(&init_mm, pmd, new); pmd_populate_kernel(&init_mm, pmd, new);
spin_unlock(&init_mm.page_table_lock); spin_unlock(&init_mm.page_table_lock);
...@@ -2501,7 +2501,7 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address) ...@@ -2501,7 +2501,7 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
spin_lock(&mm->page_table_lock); spin_lock(&mm->page_table_lock);
if (pgd_present(*pgd)) /* Another has populated it */ if (pgd_present(*pgd)) /* Another has populated it */
pud_free(new); pud_free(mm, new);
else else
pgd_populate(mm, pgd, new); pgd_populate(mm, pgd, new);
spin_unlock(&mm->page_table_lock); spin_unlock(&mm->page_table_lock);
...@@ -2523,12 +2523,12 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address) ...@@ -2523,12 +2523,12 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
spin_lock(&mm->page_table_lock); spin_lock(&mm->page_table_lock);
#ifndef __ARCH_HAS_4LEVEL_HACK #ifndef __ARCH_HAS_4LEVEL_HACK
if (pud_present(*pud)) /* Another has populated it */ if (pud_present(*pud)) /* Another has populated it */
pmd_free(new); pmd_free(mm, new);
else else
pud_populate(mm, pud, new); pud_populate(mm, pud, new);
#else #else
if (pgd_present(*pud)) /* Another has populated it */ if (pgd_present(*pud)) /* Another has populated it */
pmd_free(new); pmd_free(mm, new);
else else
pgd_populate(mm, pud, new); pgd_populate(mm, pud, new);
#endif /* __ARCH_HAS_4LEVEL_HACK */ #endif /* __ARCH_HAS_4LEVEL_HACK */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment