Patched in Tegra support.

1 files changed, 51 insertions, 160 deletions

diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 73b64a38b98..be1ac8d7789 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -30,42 +30,18 @@
 /*
  * PAGE_ALLOC_COSTLY_ORDER is the order at which allocations are deemed
  * costly to service.  That is between allocation orders which should
- * coalesce naturally under reasonable reclaim pressure and those which
+ * coelesce naturally under reasonable reclaim pressure and those which
  * will not.
  */
 #define PAGE_ALLOC_COSTLY_ORDER 3
 
-enum {
-        MIGRATE_UNMOVABLE,
-        MIGRATE_RECLAIMABLE,
-        MIGRATE_MOVABLE,
-        MIGRATE_PCPTYPES,       /* the number of types on the pcp lists */
-        MIGRATE_RESERVE = MIGRATE_PCPTYPES,
-#ifdef CONFIG_CMA
-        /*
-         * MIGRATE_CMA migration type is designed to mimic the way
-         * ZONE_MOVABLE works.  Only movable pages can be allocated
-         * from MIGRATE_CMA pageblocks and page allocator never
-         * implicitly change migration type of MIGRATE_CMA pageblock.
-         *
-         * The way to use it is to change migratetype of a range of
-         * pageblocks to MIGRATE_CMA which can be done by
-         * __free_pageblock_cma() function.  What is important though
-         * is that a range of pageblocks must be aligned to
-         * MAX_ORDER_NR_PAGES should biggest page be bigger then
-         * a single pageblock.
-         */
-        MIGRATE_CMA,
-#endif
-        MIGRATE_ISOLATE,        /* can't allocate from here */
-        MIGRATE_TYPES
-};
-
-#ifdef CONFIG_CMA
-#  define is_migrate_cma(migratetype) unlikely((migratetype) == MIGRATE_CMA)
-#else
-#  define is_migrate_cma(migratetype) false
-#endif
+#define MIGRATE_UNMOVABLE     0
+#define MIGRATE_RECLAIMABLE   1
+#define MIGRATE_MOVABLE       2
+#define MIGRATE_PCPTYPES      3 /* the number of types on the pcp lists */
+#define MIGRATE_RESERVE       3
+#define MIGRATE_ISOLATE       4 /* can't allocate from here */
+#define MIGRATE_TYPES         5
 
 #define for_each_migratetype_order(order, type) \
         for (order = 0; order < MAX_ORDER; order++) \
@@ -124,7 +100,6 @@ enum zone_stat_item {
         NR_UNSTABLE_NFS,        /* NFS unstable pages */
         NR_BOUNCE,
         NR_VMSCAN_WRITE,
-        NR_VMSCAN_IMMEDIATE,    /* Prioritise for reclaim when writeback ends */
         NR_WRITEBACK_TEMP,      /* Writeback using temporary buffers */
         NR_ISOLATED_ANON,       /* Temporary isolated pages from anon lru */
         NR_ISOLATED_FILE,       /* Temporary isolated pages from file lru */
@@ -140,7 +115,6 @@ enum zone_stat_item {
         NUMA_OTHER,             /* allocation from other node */
 #endif
         NR_ANON_TRANSPARENT_HUGEPAGES,
-        NR_FREE_CMA_PAGES,
         NR_VM_ZONE_STAT_ITEMS };
 
 /*
@@ -165,63 +139,31 @@ enum lru_list {
         NR_LRU_LISTS
 };
 
-#define for_each_lru(lru) for (lru = 0; lru < NR_LRU_LISTS; lru++)
+#define for_each_lru(l) for (l = 0; l < NR_LRU_LISTS; l++)
 
-#define for_each_evictable_lru(lru) for (lru = 0; lru <= LRU_ACTIVE_FILE; lru++)
+#define for_each_evictable_lru(l) for (l = 0; l <= LRU_ACTIVE_FILE; l++)
 
-static inline int is_file_lru(enum lru_list lru)
+static inline int is_file_lru(enum lru_list l)
 {
-        return (lru == LRU_INACTIVE_FILE || lru == LRU_ACTIVE_FILE);
+        return (l == LRU_INACTIVE_FILE || l == LRU_ACTIVE_FILE);
 }
 
-static inline int is_active_lru(enum lru_list lru)
+static inline int is_active_lru(enum lru_list l)
 {
-        return (lru == LRU_ACTIVE_ANON || lru == LRU_ACTIVE_FILE);
+        return (l == LRU_ACTIVE_ANON || l == LRU_ACTIVE_FILE);
 }
 
-static inline int is_unevictable_lru(enum lru_list lru)
+static inline int is_unevictable_lru(enum lru_list l)
 {
-        return (lru == LRU_UNEVICTABLE);
+        return (l == LRU_UNEVICTABLE);
 }
 
-struct zone_reclaim_stat {
-        /*
-         * The pageout code in vmscan.c keeps track of how many of the
-         * mem/swap backed and file backed pages are referenced.
-         * The higher the rotated/scanned ratio, the more valuable
-         * that cache is.
-         *
-         * The anon LRU stats live in [0], file LRU stats in [1]
-         */
-        unsigned long           recent_rotated[2];
-        unsigned long           recent_scanned[2];
-};
-
-struct lruvec {
-        struct list_head lists[NR_LRU_LISTS];
-        struct zone_reclaim_stat reclaim_stat;
-#ifdef CONFIG_MEMCG
-        struct zone *zone;
-#endif
-};
-
 /* Mask used at gathering information at once (see memcontrol.c) */
 #define LRU_ALL_FILE (BIT(LRU_INACTIVE_FILE) | BIT(LRU_ACTIVE_FILE))
 #define LRU_ALL_ANON (BIT(LRU_INACTIVE_ANON) | BIT(LRU_ACTIVE_ANON))
+#define LRU_ALL_EVICTABLE (LRU_ALL_FILE | LRU_ALL_ANON)
 #define LRU_ALL      ((1 << NR_LRU_LISTS) - 1)
 
-/* Isolate clean file */
-#define ISOLATE_CLEAN           ((__force isolate_mode_t)0x1)
-/* Isolate unmapped file */
-#define ISOLATE_UNMAPPED        ((__force isolate_mode_t)0x2)
-/* Isolate for asynchronous migration */
-#define ISOLATE_ASYNC_MIGRATE   ((__force isolate_mode_t)0x4)
-/* Isolate unevictable pages */
-#define ISOLATE_UNEVICTABLE     ((__force isolate_mode_t)0x8)
-
-/* LRU Isolation modes. */
-typedef unsigned __bitwise__ isolate_mode_t;
-
 enum zone_watermarks {
         WMARK_MIN,
         WMARK_LOW,
@@ -326,6 +268,19 @@ enum zone_type {
 #error ZONES_SHIFT -- too many zones configured adjust calculation
 #endif
 
+struct zone_reclaim_stat {
+        /*
+         * The pageout code in vmscan.c keeps track of how many of the
+         * mem/swap backed and file backed pages are refeferenced.
+         * The higher the rotated/scanned ratio, the more valuable
+         * that cache is.
+         *
+         * The anon LRU stats live in [0], file LRU stats in [1]
+         */
+        unsigned long           recent_rotated[2];
+        unsigned long           recent_scanned[2];
+};
+
 struct zone {
         /* Fields commonly accessed by the page allocator */
 
@@ -349,12 +304,6 @@ struct zone {
          */
         unsigned long           lowmem_reserve[MAX_NR_ZONES];
 
-        /*
-         * This is a per-zone reserve of pages that should not be
-         * considered dirtyable memory.
-         */
-        unsigned long           dirty_balance_reserve;
-
 #ifdef CONFIG_NUMA
         int node;
         /*
@@ -369,14 +318,6 @@ struct zone {
          */
         spinlock_t              lock;
         int                     all_unreclaimable; /* All pages pinned */
-#if defined CONFIG_COMPACTION || defined CONFIG_CMA
-        /* Set to true when the PG_migrate_skip bits should be cleared */
-        bool                    compact_blockskip_flush;
-
-        /* pfns where compaction scanners should start */
-        unsigned long           compact_cached_free_pfn;
-        unsigned long           compact_cached_migrate_pfn;
-#endif
 #ifdef CONFIG_MEMORY_HOTPLUG
         /* see spanned/present_pages for more description */
         seqlock_t               span_seqlock;
@@ -399,14 +340,17 @@ struct zone {
          */
         unsigned int            compact_considered;
         unsigned int            compact_defer_shift;
-        int                     compact_order_failed;
 #endif
 
         ZONE_PADDING(_pad1_)
 
         /* Fields commonly accessed by the page reclaim scanner */
-        spinlock_t              lru_lock;
-        struct lruvec           lruvec;
+        spinlock_t              lru_lock;       
+        struct zone_lru {
+                struct list_head list;
+        } lru[NR_LRU_LISTS];
+
+        struct zone_reclaim_stat reclaim_stat;
 
         unsigned long           pages_scanned;     /* since last reclaim */
         unsigned long           flags;             /* zone flags, see below */
@@ -460,44 +404,17 @@ struct zone {
         unsigned long           zone_start_pfn;
 
         /*
-         * spanned_pages is the total pages spanned by the zone, including
-         * holes, which is calculated as:
-         *      spanned_pages = zone_end_pfn - zone_start_pfn;
-         *
-         * present_pages is physical pages existing within the zone, which
-         * is calculated as:
-         *      present_pages = spanned_pages - absent_pages(pags in holes);
-         *
-         * managed_pages is present pages managed by the buddy system, which
-         * is calculated as (reserved_pages includes pages allocated by the
-         * bootmem allocator):
-         *      managed_pages = present_pages - reserved_pages;
+         * zone_start_pfn, spanned_pages and present_pages are all
+         * protected by span_seqlock.  It is a seqlock because it has
+         * to be read outside of zone->lock, and it is done in the main
+         * allocator path.  But, it is written quite infrequently.
          *
-         * So present_pages may be used by memory hotplug or memory power
-         * management logic to figure out unmanaged pages by checking
-         * (present_pages - managed_pages). And managed_pages should be used
-         * by page allocator and vm scanner to calculate all kinds of watermarks
-         * and thresholds.
-         *
-         * Locking rules:
-         *
-         * zone_start_pfn and spanned_pages are protected by span_seqlock.
-         * It is a seqlock because it has to be read outside of zone->lock,
-         * and it is done in the main allocator path.  But, it is written
-         * quite infrequently.
-         *
-         * The span_seq lock is declared along with zone->lock because it is
+         * The lock is declared along with zone->lock because it is
          * frequently read in proximity to zone->lock.  It's good to
          * give them a chance of being in the same cacheline.
-         *
-         * Write access to present_pages and managed_pages at runtime should
-         * be protected by lock_memory_hotplug()/unlock_memory_hotplug().
-         * Any reader who can't tolerant drift of present_pages and
-         * managed_pages should hold memory hotplug lock to get a stable value.
          */
-        unsigned long           spanned_pages;
-        unsigned long           present_pages;
-        unsigned long           managed_pages;
+        unsigned long           spanned_pages;  /* total size, including holes */
+        unsigned long           present_pages;  /* amount of memory (excluding holes) */
 
         /*
          * rarely used fields:
@@ -668,13 +585,13 @@ struct zonelist {
 #endif
 };
 
-#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
+#ifdef CONFIG_ARCH_POPULATES_NODE_MAP
 struct node_active_region {
         unsigned long start_pfn;
         unsigned long end_pfn;
         int nid;
 };
-#endif /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */
+#endif /* CONFIG_ARCH_POPULATES_NODE_MAP */
 
 #ifndef CONFIG_DISCONTIGMEM
 /* The array of struct pages - for discontigmem use pgdat->lmem_map */
@@ -699,7 +616,7 @@ typedef struct pglist_data {
         int nr_zones;
 #ifdef CONFIG_FLAT_NODE_MEM_MAP /* means !SPARSEMEM */
         struct page *node_mem_map;
-#ifdef CONFIG_MEMCG
+#ifdef CONFIG_CGROUP_MEM_RES_CTLR
         struct page_cgroup *node_page_cgroup;
 #endif
 #endif
@@ -721,25 +638,10 @@ typedef struct pglist_data {
         unsigned long node_spanned_pages; /* total size of physical page
                                              range, including holes */
         int node_id;
-        nodemask_t reclaim_nodes;       /* Nodes allowed to reclaim from */
         wait_queue_head_t kswapd_wait;
-        wait_queue_head_t pfmemalloc_wait;
-        struct task_struct *kswapd;     /* Protected by lock_memory_hotplug() */
+        struct task_struct *kswapd;
         int kswapd_max_order;
         enum zone_type classzone_idx;
-#ifdef CONFIG_NUMA_BALANCING
-        /*
-         * Lock serializing the per destination node AutoNUMA memory
-         * migration rate limiting data.
-         */
-        spinlock_t numabalancing_migrate_lock;
-
-        /* Rate limiting time interval */
-        unsigned long numabalancing_migrate_next_window;
-
-        /* Number of pages migrated during the rate limiting time interval */
-        unsigned long numabalancing_migrate_nr_pages;
-#endif
 } pg_data_t;
 
 #define node_present_pages(nid) (NODE_DATA(nid)->node_present_pages)
@@ -761,7 +663,7 @@ typedef struct pglist_data {
 #include <linux/memory_hotplug.h>
 
 extern struct mutex zonelists_mutex;
-void build_all_zonelists(pg_data_t *pgdat, struct zone *zone);
+void build_all_zonelists(void *data);
 void wakeup_kswapd(struct zone *zone, int order, enum zone_type classzone_idx);
 bool zone_watermark_ok(struct zone *z, int order, unsigned long mark,
                 int classzone_idx, int alloc_flags);
@@ -775,17 +677,6 @@ extern int init_currently_empty_zone(struct zone *zone, unsigned long start_pfn,
                                      unsigned long size,
                                      enum memmap_context context);
 
-extern void lruvec_init(struct lruvec *lruvec);
-
-static inline struct zone *lruvec_zone(struct lruvec *lruvec)
-{
-#ifdef CONFIG_MEMCG
-        return lruvec->zone;
-#else
-        return container_of(lruvec, struct zone, lruvec);
-#endif
-}
-
 #ifdef CONFIG_HAVE_MEMORY_PRESENT
 void memory_present(int nid, unsigned long start, unsigned long end);
 #else
@@ -816,7 +707,7 @@ extern int movable_zone;
 
 static inline int zone_movable_is_highmem(void)
 {
-#if defined(CONFIG_HIGHMEM) && defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP)
+#if defined(CONFIG_HIGHMEM) && defined(CONFIG_ARCH_POPULATES_NODE_MAP)
         return movable_zone == ZONE_HIGHMEM;
 #else
         return 0;
@@ -1034,7 +925,7 @@ static inline struct zoneref *first_zones_zonelist(struct zonelist *zonelist,
 #endif
 
 #if !defined(CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID) && \
-        !defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP)
+        !defined(CONFIG_ARCH_POPULATES_NODE_MAP)
 static inline unsigned long early_pfn_to_nid(unsigned long pfn)
 {
         return 0;
@@ -1095,7 +986,7 @@ struct mem_section {
 
         /* See declaration of similar field in struct zone */
         unsigned long *pageblock_flags;
-#ifdef CONFIG_MEMCG
+#ifdef CONFIG_CGROUP_MEM_RES_CTLR
         /*
          * If !SPARSEMEM, pgdat doesn't have page_cgroup pointer. We use
          * section. (see memcontrol.h/page_cgroup.h about this.)