Patched in Tegra support.

1 files changed, 15 insertions, 81 deletions

diff --git a/mm/internal.h b/mm/internal.h
index 9ba21100ebf..2189af49178 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -92,11 +92,6 @@ extern int isolate_lru_page(struct page *page);
 extern void putback_lru_page(struct page *page);
 
 /*
- * in mm/rmap.c:
- */
-extern pmd_t *mm_find_pmd(struct mm_struct *mm, unsigned long address);
-
-/*
  * in mm/page_alloc.c
  */
 extern void __free_pages_bootmem(struct page *page, unsigned int order);
@@ -105,46 +100,6 @@ extern void prep_compound_page(struct page *page, unsigned long order);
 extern bool is_free_buddy_page(struct page *page);
 #endif
 
-#if defined CONFIG_COMPACTION || defined CONFIG_CMA
-
-/*
- * in mm/compaction.c
- */
-/*
- * compact_control is used to track pages being migrated and the free pages
- * they are being migrated to during memory compaction. The free_pfn starts
- * at the end of a zone and migrate_pfn begins at the start. Movable pages
- * are moved to the end of a zone during a compaction run and the run
- * completes when free_pfn <= migrate_pfn
- */
-struct compact_control {
-        struct list_head freepages;     /* List of free pages to migrate to */
-        struct list_head migratepages;  /* List of pages being migrated */
-        unsigned long nr_freepages;     /* Number of isolated free pages */
-        unsigned long nr_migratepages;  /* Number of pages to migrate */
-        unsigned long free_pfn;         /* isolate_freepages search base */
-        unsigned long migrate_pfn;      /* isolate_migratepages search base */
-        bool sync;                      /* Synchronous migration */
-        bool ignore_skip_hint;          /* Scan blocks even if marked skip */
-        bool finished_update_free;      /* True when the zone cached pfns are
-                                         * no longer being updated
-                                         */
-        bool finished_update_migrate;
-
-        int order;                      /* order a direct compactor needs */
-        int migratetype;                /* MOVABLE, RECLAIMABLE etc */
-        struct zone *zone;
-        bool contended;                 /* True if a lock was contended */
-};
-
-unsigned long
-isolate_freepages_range(struct compact_control *cc,
-                        unsigned long start_pfn, unsigned long end_pfn);
-unsigned long
-isolate_migratepages_range(struct zone *zone, struct compact_control *cc,
-        unsigned long low_pfn, unsigned long end_pfn, bool unevictable);
-
-#endif
 
 /*
  * function for dealing with page's order in buddy system.
@@ -172,11 +127,11 @@ static inline void munlock_vma_pages_all(struct vm_area_struct *vma)
 }
 
 /*
- * Called only in fault path, to determine if a new page is being
- * mapped into a LOCKED vma.  If it is, mark page as mlocked.
+ * Called only in fault path via page_evictable() for a new page
+ * to determine if it's being mapped into a LOCKED vma.
+ * If so, mark page as mlocked.
  */
-static inline int mlocked_vma_newpage(struct vm_area_struct *vma,
-                                    struct page *page)
+static inline int is_mlocked_vma(struct vm_area_struct *vma, struct page *page)
 {
         VM_BUG_ON(PageLRU(page));
 
@@ -184,8 +139,7 @@ static inline int mlocked_vma_newpage(struct vm_area_struct *vma,
                 return 0;
 
         if (!TestSetPageMlocked(page)) {
-                mod_zone_page_state(page_zone(page), NR_MLOCK,
-                                    hpage_nr_pages(page));
+                inc_zone_page_state(page, NR_MLOCK);
                 count_vm_event(UNEVICTABLE_PGMLOCKED);
         }
         return 1;
@@ -206,7 +160,12 @@ extern void munlock_vma_page(struct page *page);
  * If called for a page that is still mapped by mlocked vmas, all we do
  * is revert to lazy LRU behaviour -- semantics are not broken.
  */
-extern void clear_page_mlock(struct page *page);
+extern void __clear_page_mlock(struct page *page);
+static inline void clear_page_mlock(struct page *page)
+{
+        if (unlikely(TestClearPageMlocked(page)))
+                __clear_page_mlock(page);
+}
 
 /*
  * mlock_migrate_page - called only from migrate_page_copy() to
@@ -216,24 +175,21 @@ static inline void mlock_migrate_page(struct page *newpage, struct page *page)
 {
         if (TestClearPageMlocked(page)) {
                 unsigned long flags;
-                int nr_pages = hpage_nr_pages(page);
 
                 local_irq_save(flags);
-                __mod_zone_page_state(page_zone(page), NR_MLOCK, -nr_pages);
+                __dec_zone_page_state(page, NR_MLOCK);
                 SetPageMlocked(newpage);
-                __mod_zone_page_state(page_zone(newpage), NR_MLOCK, nr_pages);
+                __inc_zone_page_state(newpage, NR_MLOCK);
                 local_irq_restore(flags);
         }
 }
 
-extern pmd_t maybe_pmd_mkwrite(pmd_t pmd, struct vm_area_struct *vma);
-
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
 extern unsigned long vma_address(struct page *page,
                                  struct vm_area_struct *vma);
 #endif
 #else /* !CONFIG_MMU */
-static inline int mlocked_vma_newpage(struct vm_area_struct *v, struct page *p)
+static inline int is_mlocked_vma(struct vm_area_struct *v, struct page *p)
 {
         return 0;
 }
@@ -343,6 +299,7 @@ static inline void mminit_validate_memmodel_limits(unsigned long *start_pfn,
 #define ZONE_RECLAIM_FULL       -1
 #define ZONE_RECLAIM_SOME       0
 #define ZONE_RECLAIM_SUCCESS    1
+#endif
 
 extern int hwpoison_filter(struct page *p);
 
@@ -352,26 +309,3 @@ extern u64 hwpoison_filter_flags_mask;
 extern u64 hwpoison_filter_flags_value;
 extern u64 hwpoison_filter_memcg;
 extern u32 hwpoison_filter_enable;
-
-extern unsigned long vm_mmap_pgoff(struct file *, unsigned long,
-        unsigned long, unsigned long,
-        unsigned long, unsigned long);
-
-extern void set_pageblock_order(void);
-unsigned long reclaim_clean_pages_from_list(struct zone *zone,
-                                            struct list_head *page_list);
-/* The ALLOC_WMARK bits are used as an index to zone->watermark */
-#define ALLOC_WMARK_MIN         WMARK_MIN
-#define ALLOC_WMARK_LOW         WMARK_LOW
-#define ALLOC_WMARK_HIGH        WMARK_HIGH
-#define ALLOC_NO_WATERMARKS     0x04 /* don't check watermarks at all */
-
-/* Mask to get the watermark bits */
-#define ALLOC_WMARK_MASK        (ALLOC_NO_WATERMARKS-1)
-
-#define ALLOC_HARDER            0x10 /* try to alloc harder */
-#define ALLOC_HIGH              0x20 /* __GFP_HIGH set */
-#define ALLOC_CPUSET            0x40 /* check for correct cpuset */
-#define ALLOC_CMA               0x80 /* allow allocations from CMA areas */
-
-#endif  /* __MM_INTERNAL_H */