Patched in Tegra support.

1 files changed, 8 insertions, 60 deletions

diff --git a/mm/pgtable-generic.c b/mm/pgtable-generic.c
index 0c8323fe6c8..eb663fb533e 100644
--- a/mm/pgtable-generic.c
+++ b/mm/pgtable-generic.c
@@ -12,8 +12,8 @@
 
 #ifndef __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS
 /*
- * Only sets the access flags (dirty, accessed), as well as write 
- * permission. Furthermore, we know it always gets set to a "more
+ * Only sets the access flags (dirty, accessed, and
+ * writable). Furthermore, we know it always gets set to a "more
  * permissive" setting, which allows most architectures to optimize
  * this. We return whether the PTE actually changed, which in turn
  * instructs the caller to do things like update__mmu_cache.  This
@@ -27,7 +27,7 @@ int ptep_set_access_flags(struct vm_area_struct *vma,
         int changed = !pte_same(*ptep, entry);
         if (changed) {
                 set_pte_at(vma->vm_mm, address, ptep, entry);
-                flush_tlb_fix_spurious_fault(vma, address);
+                flush_tlb_page(vma, address);
         }
         return changed;
 }
@@ -70,11 +70,10 @@ int pmdp_clear_flush_young(struct vm_area_struct *vma,
                            unsigned long address, pmd_t *pmdp)
 {
         int young;
-#ifdef CONFIG_TRANSPARENT_HUGEPAGE
-        VM_BUG_ON(address & ~HPAGE_PMD_MASK);
-#else
+#ifndef CONFIG_TRANSPARENT_HUGEPAGE
         BUG();
 #endif /* CONFIG_TRANSPARENT_HUGEPAGE */
+        VM_BUG_ON(address & ~HPAGE_PMD_MASK);
         young = pmdp_test_and_clear_young(vma, address, pmdp);
         if (young)
                 flush_tlb_range(vma, address, address + HPAGE_PMD_SIZE);
@@ -88,8 +87,7 @@ pte_t ptep_clear_flush(struct vm_area_struct *vma, unsigned long address,
 {
         pte_t pte;
         pte = ptep_get_and_clear((vma)->vm_mm, address, ptep);
-        if (pte_accessible(pte))
-                flush_tlb_page(vma, address);
+        flush_tlb_page(vma, address);
         return pte;
 }
 #endif
@@ -110,8 +108,8 @@ pmd_t pmdp_clear_flush(struct vm_area_struct *vma, unsigned long address,
 
 #ifndef __HAVE_ARCH_PMDP_SPLITTING_FLUSH
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
-void pmdp_splitting_flush(struct vm_area_struct *vma, unsigned long address,
-                          pmd_t *pmdp)
+pmd_t pmdp_splitting_flush(struct vm_area_struct *vma, unsigned long address,
+                           pmd_t *pmdp)
 {
         pmd_t pmd = pmd_mksplitting(*pmdp);
         VM_BUG_ON(address & ~HPAGE_PMD_MASK);
@@ -121,53 +119,3 @@ void pmdp_splitting_flush(struct vm_area_struct *vma, unsigned long address,
 }
 #endif /* CONFIG_TRANSPARENT_HUGEPAGE */
 #endif
-
-#ifndef __HAVE_ARCH_PGTABLE_DEPOSIT
-#ifdef CONFIG_TRANSPARENT_HUGEPAGE
-void pgtable_trans_huge_deposit(struct mm_struct *mm, pgtable_t pgtable)
-{
-        assert_spin_locked(&mm->page_table_lock);
-
-        /* FIFO */
-        if (!mm->pmd_huge_pte)
-                INIT_LIST_HEAD(&pgtable->lru);
-        else
-                list_add(&pgtable->lru, &mm->pmd_huge_pte->lru);
-        mm->pmd_huge_pte = pgtable;
-}
-#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
-#endif
-
-#ifndef __HAVE_ARCH_PGTABLE_WITHDRAW
-#ifdef CONFIG_TRANSPARENT_HUGEPAGE
-/* no "address" argument so destroys page coloring of some arch */
-pgtable_t pgtable_trans_huge_withdraw(struct mm_struct *mm)
-{
-        pgtable_t pgtable;
-
-        assert_spin_locked(&mm->page_table_lock);
-
-        /* FIFO */
-        pgtable = mm->pmd_huge_pte;
-        if (list_empty(&pgtable->lru))
-                mm->pmd_huge_pte = NULL;
-        else {
-                mm->pmd_huge_pte = list_entry(pgtable->lru.next,
-                                              struct page, lru);
-                list_del(&pgtable->lru);
-        }
-        return pgtable;
-}
-#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
-#endif
-
-#ifndef __HAVE_ARCH_PMDP_INVALIDATE
-#ifdef CONFIG_TRANSPARENT_HUGEPAGE
-void pmdp_invalidate(struct vm_area_struct *vma, unsigned long address,
-                     pmd_t *pmdp)
-{
-        set_pmd_at(vma->vm_mm, address, pmdp, pmd_mknotpresent(*pmdp));
-        flush_tlb_range(vma, address, address + HPAGE_PMD_SIZE);
-}
-#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
-#endif