mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
x86: rename paravirt_alloc_pt etc after the pagetable structure
Rename (alloc|release)_(pt|pd) to pte/pmd to explicitly match the name of the appropriate pagetable level structure. [ x86.git merge work by Mark McLoughlin <[email protected]> ] Signed-off-by: Jeremy Fitzhardinge <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Signed-off-by: Mark McLoughlin <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]>
This commit is contained in:
parent
394158559d
commit
6944a9c894
9 changed files with 69 additions and 69 deletions
|
|
@ -220,11 +220,11 @@ struct pv_mmu_ops {
|
|||
unsigned long va);
|
||||
|
||||
/* Hooks for allocating/releasing pagetable pages */
|
||||
void (*alloc_pt)(struct mm_struct *mm, u32 pfn);
|
||||
void (*alloc_pd)(struct mm_struct *mm, u32 pfn);
|
||||
void (*alloc_pd_clone)(u32 pfn, u32 clonepfn, u32 start, u32 count);
|
||||
void (*release_pt)(u32 pfn);
|
||||
void (*release_pd)(u32 pfn);
|
||||
void (*alloc_pte)(struct mm_struct *mm, u32 pfn);
|
||||
void (*alloc_pmd)(struct mm_struct *mm, u32 pfn);
|
||||
void (*alloc_pmd_clone)(u32 pfn, u32 clonepfn, u32 start, u32 count);
|
||||
void (*release_pte)(u32 pfn);
|
||||
void (*release_pmd)(u32 pfn);
|
||||
|
||||
/* Pagetable manipulation functions */
|
||||
void (*set_pte)(pte_t *ptep, pte_t pteval);
|
||||
|
|
@ -910,28 +910,28 @@ static inline void flush_tlb_others(cpumask_t cpumask, struct mm_struct *mm,
|
|||
PVOP_VCALL3(pv_mmu_ops.flush_tlb_others, &cpumask, mm, va);
|
||||
}
|
||||
|
||||
static inline void paravirt_alloc_pt(struct mm_struct *mm, unsigned pfn)
|
||||
static inline void paravirt_alloc_pte(struct mm_struct *mm, unsigned pfn)
|
||||
{
|
||||
PVOP_VCALL2(pv_mmu_ops.alloc_pt, mm, pfn);
|
||||
PVOP_VCALL2(pv_mmu_ops.alloc_pte, mm, pfn);
|
||||
}
|
||||
static inline void paravirt_release_pt(unsigned pfn)
|
||||
static inline void paravirt_release_pte(unsigned pfn)
|
||||
{
|
||||
PVOP_VCALL1(pv_mmu_ops.release_pt, pfn);
|
||||
PVOP_VCALL1(pv_mmu_ops.release_pte, pfn);
|
||||
}
|
||||
|
||||
static inline void paravirt_alloc_pd(struct mm_struct *mm, unsigned pfn)
|
||||
static inline void paravirt_alloc_pmd(struct mm_struct *mm, unsigned pfn)
|
||||
{
|
||||
PVOP_VCALL2(pv_mmu_ops.alloc_pd, mm, pfn);
|
||||
PVOP_VCALL2(pv_mmu_ops.alloc_pmd, mm, pfn);
|
||||
}
|
||||
|
||||
static inline void paravirt_alloc_pd_clone(unsigned pfn, unsigned clonepfn,
|
||||
unsigned start, unsigned count)
|
||||
static inline void paravirt_alloc_pmd_clone(unsigned pfn, unsigned clonepfn,
|
||||
unsigned start, unsigned count)
|
||||
{
|
||||
PVOP_VCALL4(pv_mmu_ops.alloc_pd_clone, pfn, clonepfn, start, count);
|
||||
PVOP_VCALL4(pv_mmu_ops.alloc_pmd_clone, pfn, clonepfn, start, count);
|
||||
}
|
||||
static inline void paravirt_release_pd(unsigned pfn)
|
||||
static inline void paravirt_release_pmd(unsigned pfn)
|
||||
{
|
||||
PVOP_VCALL1(pv_mmu_ops.release_pd, pfn);
|
||||
PVOP_VCALL1(pv_mmu_ops.release_pmd, pfn);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_HIGHPTE
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
#ifdef CONFIG_PARAVIRT
|
||||
#include <asm/paravirt.h>
|
||||
#else
|
||||
#define paravirt_alloc_pt(mm, pfn) do { } while (0)
|
||||
#define paravirt_alloc_pd(mm, pfn) do { } while (0)
|
||||
#define paravirt_alloc_pd_clone(pfn, clonepfn, start, count) do { } while (0)
|
||||
#define paravirt_release_pt(pfn) do { } while (0)
|
||||
#define paravirt_release_pd(pfn) do { } while (0)
|
||||
#define paravirt_alloc_pte(mm, pfn) do { } while (0)
|
||||
#define paravirt_alloc_pmd(mm, pfn) do { } while (0)
|
||||
#define paravirt_alloc_pmd_clone(pfn, clonepfn, start, count) do { } while (0)
|
||||
#define paravirt_release_pte(pfn) do { } while (0)
|
||||
#define paravirt_release_pmd(pfn) do { } while (0)
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
|
@ -43,7 +43,7 @@ extern void __pte_free_tlb(struct mmu_gather *tlb, struct page *pte);
|
|||
static inline void pmd_populate_kernel(struct mm_struct *mm,
|
||||
pmd_t *pmd, pte_t *pte)
|
||||
{
|
||||
paravirt_alloc_pt(mm, __pa(pte) >> PAGE_SHIFT);
|
||||
paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
|
||||
set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
|
||||
}
|
||||
|
||||
|
|
@ -52,7 +52,7 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd,
|
|||
{
|
||||
unsigned long pfn = page_to_pfn(pte);
|
||||
|
||||
paravirt_alloc_pt(mm, pfn);
|
||||
paravirt_alloc_pte(mm, pfn);
|
||||
set_pmd(pmd, __pmd(((pteval_t)pfn << PAGE_SHIFT) | _PAGE_TABLE));
|
||||
}
|
||||
|
||||
|
|
@ -77,7 +77,7 @@ extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd);
|
|||
#else /* !CONFIG_X86_PAE */
|
||||
static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
|
||||
{
|
||||
paravirt_alloc_pd(mm, __pa(pmd) >> PAGE_SHIFT);
|
||||
paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
|
||||
set_pud(pud, __pud(_PAGE_TABLE | __pa(pmd)));
|
||||
}
|
||||
#endif /* CONFIG_X86_PAE */
|
||||
|
|
|
|||
Loading…
Reference in a new issue