diff options
Diffstat (limited to 'arch/sparc/include/asm/pgalloc_64.h')
| -rw-r--r-- | arch/sparc/include/asm/pgalloc_64.h | 56 |
1 files changed, 12 insertions, 44 deletions
diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h index 40b2d7a7023d..bcfe063bce23 100644 --- a/arch/sparc/include/asm/pgalloc_64.h +++ b/arch/sparc/include/asm/pgalloc_64.h | |||
| @@ -38,51 +38,20 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd) | |||
| 38 | kmem_cache_free(pgtable_cache, pmd); | 38 | kmem_cache_free(pgtable_cache, pmd); |
| 39 | } | 39 | } |
| 40 | 40 | ||
| 41 | static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm, | 41 | extern pte_t *pte_alloc_one_kernel(struct mm_struct *mm, |
| 42 | unsigned long address) | 42 | unsigned long address); |
| 43 | { | 43 | extern pgtable_t pte_alloc_one(struct mm_struct *mm, |
| 44 | return (pte_t *)__get_free_page(GFP_KERNEL | __GFP_REPEAT | __GFP_ZERO); | 44 | unsigned long address); |
| 45 | } | 45 | extern void pte_free_kernel(struct mm_struct *mm, pte_t *pte); |
| 46 | 46 | extern void pte_free(struct mm_struct *mm, pgtable_t ptepage); | |
| 47 | static inline pgtable_t pte_alloc_one(struct mm_struct *mm, | ||
| 48 | unsigned long address) | ||
| 49 | { | ||
| 50 | struct page *page; | ||
| 51 | pte_t *pte; | ||
| 52 | |||
| 53 | pte = pte_alloc_one_kernel(mm, address); | ||
| 54 | if (!pte) | ||
| 55 | return NULL; | ||
| 56 | page = virt_to_page(pte); | ||
| 57 | pgtable_page_ctor(page); | ||
| 58 | return page; | ||
| 59 | } | ||
| 60 | |||
| 61 | static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte) | ||
| 62 | { | ||
| 63 | free_page((unsigned long)pte); | ||
| 64 | } | ||
| 65 | |||
| 66 | static inline void pte_free(struct mm_struct *mm, pgtable_t ptepage) | ||
| 67 | { | ||
| 68 | pgtable_page_dtor(ptepage); | ||
| 69 | __free_page(ptepage); | ||
| 70 | } | ||
| 71 | 47 | ||
| 72 | #define pmd_populate_kernel(MM, PMD, PTE) pmd_set(PMD, PTE) | 48 | #define pmd_populate_kernel(MM, PMD, PTE) pmd_set(MM, PMD, PTE) |
| 73 | #define pmd_populate(MM,PMD,PTE_PAGE) \ | 49 | #define pmd_populate(MM, PMD, PTE) pmd_set(MM, PMD, PTE) |
| 74 | pmd_populate_kernel(MM,PMD,page_address(PTE_PAGE)) | 50 | #define pmd_pgtable(PMD) ((pte_t *)__pmd_page(PMD)) |
| 75 | #define pmd_pgtable(pmd) pmd_page(pmd) | ||
| 76 | 51 | ||
| 77 | #define check_pgt_cache() do { } while (0) | 52 | #define check_pgt_cache() do { } while (0) |
| 78 | 53 | ||
| 79 | static inline void pgtable_free(void *table, bool is_page) | 54 | extern void pgtable_free(void *table, bool is_page); |
| 80 | { | ||
| 81 | if (is_page) | ||
| 82 | free_page((unsigned long)table); | ||
| 83 | else | ||
| 84 | kmem_cache_free(pgtable_cache, table); | ||
| 85 | } | ||
| 86 | 55 | ||
| 87 | #ifdef CONFIG_SMP | 56 | #ifdef CONFIG_SMP |
| 88 | 57 | ||
| @@ -113,11 +82,10 @@ static inline void pgtable_free_tlb(struct mmu_gather *tlb, void *table, bool is | |||
| 113 | } | 82 | } |
| 114 | #endif /* !CONFIG_SMP */ | 83 | #endif /* !CONFIG_SMP */ |
| 115 | 84 | ||
| 116 | static inline void __pte_free_tlb(struct mmu_gather *tlb, struct page *ptepage, | 85 | static inline void __pte_free_tlb(struct mmu_gather *tlb, pte_t *pte, |
| 117 | unsigned long address) | 86 | unsigned long address) |
| 118 | { | 87 | { |
| 119 | pgtable_page_dtor(ptepage); | 88 | pgtable_free_tlb(tlb, pte, true); |
| 120 | pgtable_free_tlb(tlb, page_address(ptepage), true); | ||
| 121 | } | 89 | } |
| 122 | 90 | ||
| 123 | #define __pmd_free_tlb(tlb, pmd, addr) \ | 91 | #define __pmd_free_tlb(tlb, pmd, addr) \ |