Commit 74701d59 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Michael Ellerman

powerpc/mm: Rename function to indicate we are allocating fragments

Only code cleanup. No functionality change.
Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent bcbe7f77
...@@ -174,8 +174,8 @@ static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t table, ...@@ -174,8 +174,8 @@ static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t table,
#else /* if CONFIG_PPC_64K_PAGES */ #else /* if CONFIG_PPC_64K_PAGES */
extern pte_t *page_table_alloc(struct mm_struct *, unsigned long, int); extern pte_t *pte_fragment_alloc(struct mm_struct *, unsigned long, int);
extern void page_table_free(struct mm_struct *, unsigned long *, int); extern void pte_fragment_free(unsigned long *, int);
extern void pgtable_free_tlb(struct mmu_gather *tlb, void *table, int shift); extern void pgtable_free_tlb(struct mmu_gather *tlb, void *table, int shift);
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
extern void __tlb_remove_table(void *_table); extern void __tlb_remove_table(void *_table);
...@@ -195,23 +195,23 @@ static inline pgtable_t pmd_pgtable(pmd_t pmd) ...@@ -195,23 +195,23 @@ static inline pgtable_t pmd_pgtable(pmd_t pmd)
static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm, static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
unsigned long address) unsigned long address)
{ {
return (pte_t *)page_table_alloc(mm, address, 1); return (pte_t *)pte_fragment_alloc(mm, address, 1);
} }
static inline pgtable_t pte_alloc_one(struct mm_struct *mm, static inline pgtable_t pte_alloc_one(struct mm_struct *mm,
unsigned long address) unsigned long address)
{ {
return (pgtable_t)page_table_alloc(mm, address, 0); return (pgtable_t)pte_fragment_alloc(mm, address, 0);
} }
static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte) static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
{ {
page_table_free(mm, (unsigned long *)pte, 1); pte_fragment_free((unsigned long *)pte, 1);
} }
static inline void pte_free(struct mm_struct *mm, pgtable_t ptepage) static inline void pte_free(struct mm_struct *mm, pgtable_t ptepage)
{ {
page_table_free(mm, (unsigned long *)ptepage, 0); pte_fragment_free((unsigned long *)ptepage, 0);
} }
static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t table, static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t table,
......
...@@ -164,8 +164,8 @@ static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t table, ...@@ -164,8 +164,8 @@ static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t table,
#else /* if CONFIG_PPC_64K_PAGES */ #else /* if CONFIG_PPC_64K_PAGES */
extern pte_t *page_table_alloc(struct mm_struct *, unsigned long, int); extern pte_t *pte_fragment_alloc(struct mm_struct *, unsigned long, int);
extern void page_table_free(struct mm_struct *, unsigned long *, int); extern void pte_fragment_free(unsigned long *, int);
extern void pgtable_free_tlb(struct mmu_gather *tlb, void *table, int shift); extern void pgtable_free_tlb(struct mmu_gather *tlb, void *table, int shift);
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
extern void __tlb_remove_table(void *_table); extern void __tlb_remove_table(void *_table);
...@@ -193,23 +193,23 @@ static inline pgtable_t pmd_pgtable(pmd_t pmd) ...@@ -193,23 +193,23 @@ static inline pgtable_t pmd_pgtable(pmd_t pmd)
static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm, static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
unsigned long address) unsigned long address)
{ {
return (pte_t *)page_table_alloc(mm, address, 1); return (pte_t *)pte_fragment_alloc(mm, address, 1);
} }
static inline pgtable_t pte_alloc_one(struct mm_struct *mm, static inline pgtable_t pte_alloc_one(struct mm_struct *mm,
unsigned long address) unsigned long address)
{ {
return (pgtable_t)page_table_alloc(mm, address, 0); return (pgtable_t)pte_fragment_alloc(mm, address, 0);
} }
static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte) static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
{ {
page_table_free(mm, (unsigned long *)pte, 1); pte_fragment_fre((unsigned long *)pte, 1);
} }
static inline void pte_free(struct mm_struct *mm, pgtable_t ptepage) static inline void pte_free(struct mm_struct *mm, pgtable_t ptepage)
{ {
page_table_free(mm, (unsigned long *)ptepage, 0); pte_fragment_free((unsigned long *)ptepage, 0);
} }
static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t table, static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t table,
......
...@@ -357,7 +357,7 @@ static pte_t *__alloc_for_cache(struct mm_struct *mm, int kernel) ...@@ -357,7 +357,7 @@ static pte_t *__alloc_for_cache(struct mm_struct *mm, int kernel)
return (pte_t *)ret; return (pte_t *)ret;
} }
pte_t *page_table_alloc(struct mm_struct *mm, unsigned long vmaddr, int kernel) pte_t *pte_fragment_alloc(struct mm_struct *mm, unsigned long vmaddr, int kernel)
{ {
pte_t *pte; pte_t *pte;
...@@ -368,7 +368,7 @@ pte_t *page_table_alloc(struct mm_struct *mm, unsigned long vmaddr, int kernel) ...@@ -368,7 +368,7 @@ pte_t *page_table_alloc(struct mm_struct *mm, unsigned long vmaddr, int kernel)
return __alloc_for_cache(mm, kernel); return __alloc_for_cache(mm, kernel);
} }
void page_table_free(struct mm_struct *mm, unsigned long *table, int kernel) void pte_fragment_free(unsigned long *table, int kernel)
{ {
struct page *page = virt_to_page(table); struct page *page = virt_to_page(table);
if (put_page_testzero(page)) { if (put_page_testzero(page)) {
...@@ -379,15 +379,6 @@ void page_table_free(struct mm_struct *mm, unsigned long *table, int kernel) ...@@ -379,15 +379,6 @@ void page_table_free(struct mm_struct *mm, unsigned long *table, int kernel)
} }
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
static void page_table_free_rcu(void *table)
{
struct page *page = virt_to_page(table);
if (put_page_testzero(page)) {
pgtable_page_dtor(page);
free_hot_cold_page(page, 0);
}
}
void pgtable_free_tlb(struct mmu_gather *tlb, void *table, int shift) void pgtable_free_tlb(struct mmu_gather *tlb, void *table, int shift)
{ {
unsigned long pgf = (unsigned long)table; unsigned long pgf = (unsigned long)table;
...@@ -404,7 +395,7 @@ void __tlb_remove_table(void *_table) ...@@ -404,7 +395,7 @@ void __tlb_remove_table(void *_table)
if (!shift) if (!shift)
/* PTE page needs special handling */ /* PTE page needs special handling */
page_table_free_rcu(table); pte_fragment_free(table, 0);
else { else {
BUG_ON(shift > MAX_PGTABLE_INDEX_SIZE); BUG_ON(shift > MAX_PGTABLE_INDEX_SIZE);
kmem_cache_free(PGT_CACHE(shift), table); kmem_cache_free(PGT_CACHE(shift), table);
...@@ -415,11 +406,7 @@ void pgtable_free_tlb(struct mmu_gather *tlb, void *table, int shift) ...@@ -415,11 +406,7 @@ void pgtable_free_tlb(struct mmu_gather *tlb, void *table, int shift)
{ {
if (!shift) { if (!shift) {
/* PTE page needs special handling */ /* PTE page needs special handling */
struct page *page = virt_to_page(table); pte_fragment_free(table, 0);
if (put_page_testzero(page)) {
pgtable_page_dtor(page);
free_hot_cold_page(page, 0);
}
} else { } else {
BUG_ON(shift > MAX_PGTABLE_INDEX_SIZE); BUG_ON(shift > MAX_PGTABLE_INDEX_SIZE);
kmem_cache_free(PGT_CACHE(shift), table); kmem_cache_free(PGT_CACHE(shift), table);
......
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