Merge tag 'x86_shstk_for_6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / x86 / include / asm / pgtable.h

diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
index e95cfd3f1ddaa8c94e696fb066a812b3841cafe1..d6ad98ca1288d22f7b69c05382a404b47427e611 100644 (file)
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -218,6 +218,8 @@ static inline int pte_special(pte_t pte)
 
 static inline u64 protnone_mask(u64 val);
 
+#define PFN_PTE_SHIFT  PAGE_SHIFT
+
 static inline unsigned long pte_pfn(pte_t pte)
 {
        phys_addr_t pfn = pte_val(pte);
@@ -1231,24 +1233,17 @@ static inline pud_t native_local_pudp_get_and_clear(pud_t *pudp)
        return res;
 }
 
-static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,
-                             pte_t *ptep, pte_t pte)
-{
-       page_table_check_pte_set(mm, addr, ptep, pte);
-       set_pte(ptep, pte);
-}
-
 static inline void set_pmd_at(struct mm_struct *mm, unsigned long addr,
                              pmd_t *pmdp, pmd_t pmd)
 {
-       page_table_check_pmd_set(mm, addr, pmdp, pmd);
+       page_table_check_pmd_set(mm, pmdp, pmd);
        set_pmd(pmdp, pmd);
 }
 
 static inline void set_pud_at(struct mm_struct *mm, unsigned long addr,
                              pud_t *pudp, pud_t pud)
 {
-       page_table_check_pud_set(mm, addr, pudp, pud);
+       page_table_check_pud_set(mm, pudp, pud);
        native_set_pud(pudp, pud);
 }
 
@@ -1279,7 +1274,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr,
                                       pte_t *ptep)
 {
        pte_t pte = native_ptep_get_and_clear(ptep);
-       page_table_check_pte_clear(mm, addr, pte);
+       page_table_check_pte_clear(mm, pte);
        return pte;
 }
 
@@ -1295,7 +1290,7 @@ static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm,
                 * care about updates and native needs no locking
                 */
                pte = native_local_ptep_get_and_clear(ptep);
-               page_table_check_pte_clear(mm, addr, pte);
+               page_table_check_pte_clear(mm, pte);
        } else {
                pte = ptep_get_and_clear(mm, addr, ptep);
        }
@@ -1348,7 +1343,7 @@ static inline pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm, unsigned long
 {
        pmd_t pmd = native_pmdp_get_and_clear(pmdp);
 
-       page_table_check_pmd_clear(mm, addr, pmd);
+       page_table_check_pmd_clear(mm, pmd);
 
        return pmd;
 }
@@ -1359,7 +1354,7 @@ static inline pud_t pudp_huge_get_and_clear(struct mm_struct *mm,
 {
        pud_t pud = native_pudp_get_and_clear(pudp);
 
-       page_table_check_pud_clear(mm, addr, pud);
+       page_table_check_pud_clear(mm, pud);
 
        return pud;
 }
@@ -1386,7 +1381,7 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
 static inline pmd_t pmdp_establish(struct vm_area_struct *vma,
                unsigned long address, pmd_t *pmdp, pmd_t pmd)
 {
-       page_table_check_pmd_set(vma->vm_mm, address, pmdp, pmd);
+       page_table_check_pmd_set(vma->vm_mm, pmdp, pmd);
        if (IS_ENABLED(CONFIG_SMP)) {
                return xchg(pmdp, pmd);
        } else {
@@ -1511,6 +1506,11 @@ static inline void update_mmu_cache(struct vm_area_struct *vma,
                unsigned long addr, pte_t *ptep)
 {
 }
+static inline void update_mmu_cache_range(struct vm_fault *vmf,
+               struct vm_area_struct *vma, unsigned long addr,
+               pte_t *ptep, unsigned int nr)
+{
+}
 static inline void update_mmu_cache_pmd(struct vm_area_struct *vma,
                unsigned long addr, pmd_t *pmd)
 {