diff options
Diffstat (limited to 'arch/powerpc/include/asm/pgalloc.h')
| -rw-r--r-- | arch/powerpc/include/asm/pgalloc.h | 43 |
1 files changed, 7 insertions, 36 deletions
diff --git a/arch/powerpc/include/asm/pgalloc.h b/arch/powerpc/include/asm/pgalloc.h index 5d8480265a7..e9a9f60e596 100644 --- a/arch/powerpc/include/asm/pgalloc.h +++ b/arch/powerpc/include/asm/pgalloc.h @@ -3,31 +3,16 @@ #ifdef __KERNEL__ #include <linux/mm.h> +#include <asm-generic/tlb.h> -static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte) +#ifdef CONFIG_PPC_BOOK3E +extern void tlb_flush_pgtable(struct mmu_gather *tlb, unsigned long address); +#else /* CONFIG_PPC_BOOK3E */ +static inline void tlb_flush_pgtable(struct mmu_gather *tlb, + unsigned long address) { - free_page((unsigned long)pte); -} - -static inline void pte_free(struct mm_struct *mm, pgtable_t ptepage) -{ - pgtable_page_dtor(ptepage); - __free_page(ptepage); -} - -typedef struct pgtable_free { - unsigned long val; -} pgtable_free_t; - -#define PGF_CACHENUM_MASK 0x7 - -static inline pgtable_free_t pgtable_free_cache(void *p, int cachenum, - unsigned long mask) -{ - BUG_ON(cachenum > PGF_CACHENUM_MASK); - - return (pgtable_free_t){.val = ((unsigned long) p & ~mask) | cachenum}; } +#endif /* !CONFIG_PPC_BOOK3E */ #ifdef CONFIG_PPC64 #include <asm/pgalloc-64.h> @@ -35,19 +20,5 @@ static inline pgtable_free_t pgtable_free_cache(void *p, int cachenum, #include <asm/pgalloc-32.h> #endif -extern void pgtable_free_tlb(struct mmu_gather *tlb, pgtable_free_t pgf); - -#ifdef CONFIG_SMP -#define __pte_free_tlb(tlb,ptepage) \ -do { \ - pgtable_page_dtor(ptepage); \ - pgtable_free_tlb(tlb, pgtable_free_cache(page_address(ptepage), \ - PTE_NONCACHE_NUM, PTE_TABLE_SIZE-1)); \ -} while (0) -#else -#define __pte_free_tlb(tlb, pte) pte_free((tlb)->mm, (pte)) -#endif - - #endif /* __KERNEL__ */ #endif /* _ASM_POWERPC_PGALLOC_H */ |