WebSVN – Kolibri OS – Diff – /drivers/include/asm/pgtable.h

 #define pte_clear(mm, addr, ptep)	native_pte_clear(mm, addr, ptep)
 #define pmd_clear(pmd)			native_pmd_clear(pmd)
-#define pte_update(mm, addr, ptep)              do { } while (0)
-#define pte_update_defer(mm, addr, ptep)        do { } while (0)
 #define pmd_update(mm, addr, ptep)              do { } while (0)
-#define pmd_update_defer(mm, addr, ptep)        do { } while (0)
+#define pte_update(mm, addr, ptep)              do { } while (0)
+{
 	return pmd_flags(pte) & _PAGE_PSE;
+}
-#ifdef CONFIG_TRANSPARENT_HUGEPAGE
-static inline int pmd_trans_splitting(pmd_t pmd)
-{
-	return pmd_val(pmd) & _PAGE_SPLITTING;
-}
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
 static inline int pmd_trans_huge(pmd_t pmd)
 {
-	return pmd_val(pmd) & _PAGE_PSE;
+	return (pmd_val(pmd) & (_PAGE_PSE|_PAGE_DEVMAP)) == _PAGE_PSE;
+}
 static inline int has_transparent_hugepage(void)
+{
+	return cpu_has_pse;
+}
+#ifdef __HAVE_ARCH_PTE_DEVMAP
+static inline int pmd_devmap(pmd_t pmd)
+{
+	return !!(pmd_val(pmd) & _PAGE_DEVMAP);
 	return cpu_has_pse;
 #endif
 #endif /* CONFIG_TRANSPARENT_HUGEPAGE */
 static inline pte_t pte_mkspecial(pte_t pte)
+{
 	return pte_set_flags(pte, _PAGE_SPECIAL);
+}
+static inline pte_t pte_mkdevmap(pte_t pte)
+{
+	return pte_set_flags(pte, _PAGE_SPECIAL|_PAGE_DEVMAP);
+}
 static inline pmd_t pmd_set_flags(pmd_t pmd, pmdval_t set)
+{
 	pmdval_t v = native_pmd_val(pmd);
 static inline pmd_t pmd_mkold(pmd_t pmd)
+{
 	return pmd_clear_flags(pmd, _PAGE_ACCESSED);
+}
+static inline pmd_t pmd_mkclean(pmd_t pmd)
+{
+	return pmd_clear_flags(pmd, _PAGE_DIRTY);
+}
 static inline pmd_t pmd_wrprotect(pmd_t pmd)
+{
 	return pmd_clear_flags(pmd, _PAGE_RW);
+}
 static inline pmd_t pmd_mkdirty(pmd_t pmd)
+{
+	return pmd_set_flags(pmd, _PAGE_DIRTY | _PAGE_SOFT_DIRTY);
+}
+static inline pmd_t pmd_mkdevmap(pmd_t pmd)
+{
-	return pmd_set_flags(pmd, _PAGE_DIRTY | _PAGE_SOFT_DIRTY);
+	return pmd_set_flags(pmd, _PAGE_DEVMAP);
+}
 static inline pmd_t pmd_mkhuge(pmd_t pmd)
 static inline int pte_present(pte_t a)
+{
 	return pte_flags(a) & (_PAGE_PRESENT | _PAGE_PROTNONE);
+}
+#ifdef __HAVE_ARCH_PTE_DEVMAP
+static inline int pte_devmap(pte_t a)
+{
+	return (pte_flags(a) & _PAGE_DEVMAP) == _PAGE_DEVMAP;
+}
+#endif
 #define pte_accessible pte_accessible
 static inline bool pte_accessible(struct mm_struct *mm, pte_t a)
+{
 	if (pte_flags(a) & _PAGE_PRESENT)
  * has not been done using the set_pte / clear_pte interfaces.  It is used by
  * shadow mode hypervisors to resynchronize the shadow page tables.  Kernel PTE
  * updates should either be sets, clears, or set_pte_atomic for P->P
  * transitions, which means this hook should only be called for user PTEs.
  * This hook implies a P->P protection or access change has taken place, which
- * requires a subsequent TLB flush.  The notification can optionally be delayed
+ * requires a subsequent TLB flush.
- * until the TLB flush event by using the pte_update_defer form of the
- * interface, but care must be taken to assure that the flush happens while
- * still holding the same page table lock so that the shadow and primary pages
- * do not become out of sync on SMP.
  */
 #define pte_update(mm, addr, ptep)		do { } while (0)
-#define pte_update_defer(mm, addr, ptep)	do { } while (0)
 #endif
 /*
  * We only update the dirty/accessed state if we set
 #define __HAVE_ARCH_PMDP_CLEAR_YOUNG_FLUSH
 extern int pmdp_clear_flush_young(struct vm_area_struct *vma,
 				  unsigned long address, pmd_t *pmdp);
-#define __HAVE_ARCH_PMDP_SPLITTING_FLUSH
-extern void pmdp_splitting_flush(struct vm_area_struct *vma,
 				 unsigned long addr, pmd_t *pmdp);
 #define __HAVE_ARCH_PMD_WRITE
 static inline int pmd_write(pmd_t pmd)
+{
 	return pmd_flags(pmd) & _PAGE_RW;
+}
 #define __HAVE_ARCH_PMDP_HUGE_GET_AND_CLEAR
 static inline pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm, unsigned long addr,
-				       pmd_t *pmdp)
-{
-	pmd_t pmd = native_pmdp_get_and_clear(pmdp);
+				       pmd_t *pmdp)
 	pmd_update(mm, addr, pmdp);
-	return pmd;
+	return native_pmdp_get_and_clear(pmdp);
+}
 #define __HAVE_ARCH_PMDP_SET_WRPROTECT
-static inline void pmdp_set_wrprotect(struct mm_struct *mm,
-				      unsigned long addr, pmd_t *pmdp)
+static inline void pmdp_set_wrprotect(struct mm_struct *mm,
 				      unsigned long addr, pmd_t *pmdp)
 	clear_bit(_PAGE_BIT_RW, (unsigned long *)pmdp);
-	pmd_update(mm, addr, pmdp);
+	clear_bit(_PAGE_BIT_RW, (unsigned long *)pmdp);

Subversion Repositories Kolibri OS

(root)/drivers/include/asm/pgtable.h – Rev 6934 → 6936