Patched in Tegra support.

1 files changed, 14 insertions, 64 deletions

diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h
index 1d76f8ca90f..48c32ebf65a 100644
--- a/include/linux/huge_mm.h
+++ b/include/linux/huge_mm.h
@@ -8,31 +8,22 @@ extern int do_huge_pmd_anonymous_page(struct mm_struct *mm,
 extern int copy_huge_pmd(struct mm_struct *dst_mm, struct mm_struct *src_mm,
                          pmd_t *dst_pmd, pmd_t *src_pmd, unsigned long addr,
                          struct vm_area_struct *vma);
-extern void huge_pmd_set_accessed(struct mm_struct *mm,
-                                  struct vm_area_struct *vma,
-                                  unsigned long address, pmd_t *pmd,
-                                  pmd_t orig_pmd, int dirty);
 extern int do_huge_pmd_wp_page(struct mm_struct *mm, struct vm_area_struct *vma,
                                unsigned long address, pmd_t *pmd,
                                pmd_t orig_pmd);
-extern struct page *follow_trans_huge_pmd(struct vm_area_struct *vma,
+extern pgtable_t get_pmd_huge_pte(struct mm_struct *mm);
+extern struct page *follow_trans_huge_pmd(struct mm_struct *mm,
                                           unsigned long addr,
                                           pmd_t *pmd,
                                           unsigned int flags);
 extern int zap_huge_pmd(struct mmu_gather *tlb,
                         struct vm_area_struct *vma,
-                        pmd_t *pmd, unsigned long addr);
+                        pmd_t *pmd);
 extern int mincore_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd,
                         unsigned long addr, unsigned long end,
                         unsigned char *vec);
-extern int move_huge_pmd(struct vm_area_struct *vma,
-                         struct vm_area_struct *new_vma,
-                         unsigned long old_addr,
-                         unsigned long new_addr, unsigned long old_end,
-                         pmd_t *old_pmd, pmd_t *new_pmd);
 extern int change_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd,
-                        unsigned long addr, pgprot_t newprot,
-                        int prot_numa);
+                        unsigned long addr, pgprot_t newprot);
 
 enum transparent_hugepage_flag {
         TRANSPARENT_HUGEPAGE_FLAG,
@@ -40,7 +31,6 @@ enum transparent_hugepage_flag {
         TRANSPARENT_HUGEPAGE_DEFRAG_FLAG,
         TRANSPARENT_HUGEPAGE_DEFRAG_REQ_MADV_FLAG,
         TRANSPARENT_HUGEPAGE_DEFRAG_KHUGEPAGED_FLAG,
-        TRANSPARENT_HUGEPAGE_USE_ZERO_PAGE_FLAG,
 #ifdef CONFIG_DEBUG_VM
         TRANSPARENT_HUGEPAGE_DEBUG_COW_FLAG,
 #endif
@@ -56,16 +46,11 @@ extern pmd_t *page_check_address_pmd(struct page *page,
                                      unsigned long address,
                                      enum page_check_address_pmd_flag flag);
 
-#define HPAGE_PMD_ORDER (HPAGE_PMD_SHIFT-PAGE_SHIFT)
-#define HPAGE_PMD_NR (1<<HPAGE_PMD_ORDER)
-
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
 #define HPAGE_PMD_SHIFT HPAGE_SHIFT
 #define HPAGE_PMD_MASK HPAGE_MASK
 #define HPAGE_PMD_SIZE HPAGE_SIZE
 
-extern bool is_vma_temporary_stack(struct vm_area_struct *vma);
-
 #define transparent_hugepage_enabled(__vma)                             \
         ((transparent_hugepage_flags &                                  \
           (1<<TRANSPARENT_HUGEPAGE_FLAG) ||                             \
@@ -80,9 +65,6 @@ extern bool is_vma_temporary_stack(struct vm_area_struct *vma);
          (transparent_hugepage_flags &                                  \
           (1<<TRANSPARENT_HUGEPAGE_DEFRAG_REQ_MADV_FLAG) &&             \
           (__vma)->vm_flags & VM_HUGEPAGE))
-#define transparent_hugepage_use_zero_page()                            \
-        (transparent_hugepage_flags &                                   \
-         (1<<TRANSPARENT_HUGEPAGE_USE_ZERO_PAGE_FLAG))
 #ifdef CONFIG_DEBUG_VM
 #define transparent_hugepage_debug_cow()                                \
         (transparent_hugepage_flags &                                   \
@@ -100,25 +82,23 @@ extern int handle_pte_fault(struct mm_struct *mm,
                             struct vm_area_struct *vma, unsigned long address,
                             pte_t *pte, pmd_t *pmd, unsigned int flags);
 extern int split_huge_page(struct page *page);
-extern void __split_huge_page_pmd(struct vm_area_struct *vma,
-                unsigned long address, pmd_t *pmd);
-#define split_huge_page_pmd(__vma, __address, __pmd)                    \
+extern void __split_huge_page_pmd(struct mm_struct *mm, pmd_t *pmd);
+#define split_huge_page_pmd(__mm, __pmd)                                \
         do {                                                            \
                 pmd_t *____pmd = (__pmd);                               \
                 if (unlikely(pmd_trans_huge(*____pmd)))                 \
-                        __split_huge_page_pmd(__vma, __address,         \
-                                        ____pmd);                       \
+                        __split_huge_page_pmd(__mm, ____pmd);           \
         }  while (0)
 #define wait_split_huge_page(__anon_vma, __pmd)                         \
         do {                                                            \
                 pmd_t *____pmd = (__pmd);                               \
-                anon_vma_lock_write(__anon_vma);                        \
+                anon_vma_lock(__anon_vma);                              \
                 anon_vma_unlock(__anon_vma);                            \
                 BUG_ON(pmd_trans_splitting(*____pmd) ||                 \
                        pmd_trans_huge(*____pmd));                       \
         } while (0)
-extern void split_huge_page_pmd_mm(struct mm_struct *mm, unsigned long address,
-                pmd_t *pmd);
+#define HPAGE_PMD_ORDER (HPAGE_PMD_SHIFT-PAGE_SHIFT)
+#define HPAGE_PMD_NR (1<<HPAGE_PMD_ORDER)
 #if HPAGE_PMD_ORDER > MAX_ORDER
 #error "hugepages can't be allocated by the buddy allocator"
 #endif
@@ -128,18 +108,6 @@ extern void __vma_adjust_trans_huge(struct vm_area_struct *vma,
                                     unsigned long start,
                                     unsigned long end,
                                     long adjust_next);
-extern int __pmd_trans_huge_lock(pmd_t *pmd,
-                                 struct vm_area_struct *vma);
-/* mmap_sem must be held on entry */
-static inline int pmd_trans_huge_lock(pmd_t *pmd,
-                                      struct vm_area_struct *vma)
-{
-        VM_BUG_ON(!rwsem_is_locked(&vma->vm_mm->mmap_sem));
-        if (pmd_trans_huge(*pmd))
-                return __pmd_trans_huge_lock(pmd, vma);
-        else
-                return 0;
-}
 static inline void vma_adjust_trans_huge(struct vm_area_struct *vma,
                                          unsigned long start,
                                          unsigned long end,
@@ -172,14 +140,10 @@ static inline struct page *compound_trans_head(struct page *page)
         }
         return page;
 }
-
-extern int do_huge_pmd_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,
-                                unsigned long addr, pmd_t pmd, pmd_t *pmdp);
-
 #else /* CONFIG_TRANSPARENT_HUGEPAGE */
-#define HPAGE_PMD_SHIFT ({ BUILD_BUG(); 0; })
-#define HPAGE_PMD_MASK ({ BUILD_BUG(); 0; })
-#define HPAGE_PMD_SIZE ({ BUILD_BUG(); 0; })
+#define HPAGE_PMD_SHIFT ({ BUG(); 0; })
+#define HPAGE_PMD_MASK ({ BUG(); 0; })
+#define HPAGE_PMD_SIZE ({ BUG(); 0; })
 
 #define hpage_nr_pages(x) 1
 
@@ -190,12 +154,10 @@ static inline int split_huge_page(struct page *page)
 {
         return 0;
 }
-#define split_huge_page_pmd(__vma, __address, __pmd)    \
+#define split_huge_page_pmd(__mm, __pmd)        \
         do { } while (0)
 #define wait_split_huge_page(__anon_vma, __pmd) \
         do { } while (0)
-#define split_huge_page_pmd_mm(__mm, __address, __pmd)  \
-        do { } while (0)
 #define compound_trans_head(page) compound_head(page)
 static inline int hugepage_madvise(struct vm_area_struct *vma,
                                    unsigned long *vm_flags, int advice)
@@ -209,18 +171,6 @@ static inline void vma_adjust_trans_huge(struct vm_area_struct *vma,
                                          long adjust_next)
 {
 }
-static inline int pmd_trans_huge_lock(pmd_t *pmd,
-                                      struct vm_area_struct *vma)
-{
-        return 0;
-}
-
-static inline int do_huge_pmd_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,
-                                        unsigned long addr, pmd_t pmd, pmd_t *pmdp)
-{
-        return 0;
-}
-
 #endif /* CONFIG_TRANSPARENT_HUGEPAGE */
 
 #endif /* _LINUX_HUGE_MM_H */