Patched in Tegra support.

1 files changed, 16 insertions, 51 deletions

diff --git a/mm/vmstat.c b/mm/vmstat.c
index 9800306c819..d52b13d28e8 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -78,7 +78,7 @@ void vm_events_fold_cpu(int cpu)
  *
  * vm_stat contains the global counters
  */
-atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
+atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
 EXPORT_SYMBOL(vm_stat);
 
 #ifdef CONFIG_SMP
@@ -295,7 +295,7 @@ void __dec_zone_page_state(struct page *page, enum zone_stat_item item)
 }
 EXPORT_SYMBOL(__dec_zone_page_state);
 
-#ifdef CONFIG_HAVE_CMPXCHG_LOCAL
+#ifdef CONFIG_CMPXCHG_LOCAL
 /*
  * If we have cmpxchg_local support then we do not need to incur the overhead
  * that comes with local_irq_save/restore if we use this_cpu_cmpxchg.
@@ -495,18 +495,6 @@ void refresh_cpu_vm_stats(int cpu)
                         atomic_long_add(global_diff[i], &vm_stat[i]);
 }
 
-void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
-{
-        int i;
-
-        for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
-                if (pset->vm_stat_diff[i]) {
-                        int v = pset->vm_stat_diff[i];
-                        pset->vm_stat_diff[i] = 0;
-                        atomic_long_add(v, &zone->vm_stat[i]);
-                        atomic_long_add(v, &vm_stat[i]);
-                }
-}
 #endif
 
 #ifdef CONFIG_NUMA
@@ -625,9 +613,6 @@ static char * const migratetype_names[MIGRATE_TYPES] = {
         "Reclaimable",
         "Movable",
         "Reserve",
-#ifdef CONFIG_CMA
-        "CMA",
-#endif
         "Isolate",
 };
 
@@ -717,7 +702,6 @@ const char * const vmstat_text[] = {
         "nr_unstable",
         "nr_bounce",
         "nr_vmscan_write",
-        "nr_vmscan_immediate_reclaim",
         "nr_writeback_temp",
         "nr_isolated_anon",
         "nr_isolated_file",
@@ -734,7 +718,6 @@ const char * const vmstat_text[] = {
         "numa_other",
 #endif
         "nr_anon_transparent_hugepages",
-        "nr_free_cma",
         "nr_dirty_threshold",
         "nr_dirty_background_threshold",
 
@@ -754,17 +737,16 @@ const char * const vmstat_text[] = {
         "pgmajfault",
 
         TEXTS_FOR_ZONES("pgrefill")
-        TEXTS_FOR_ZONES("pgsteal_kswapd")
-        TEXTS_FOR_ZONES("pgsteal_direct")
+        TEXTS_FOR_ZONES("pgsteal")
         TEXTS_FOR_ZONES("pgscan_kswapd")
         TEXTS_FOR_ZONES("pgscan_direct")
-        "pgscan_direct_throttle",
 
 #ifdef CONFIG_NUMA
         "zone_reclaim_failed",
 #endif
         "pginodesteal",
         "slabs_scanned",
+        "kswapd_steal",
         "kswapd_inodesteal",
         "kswapd_low_wmark_hit_quickly",
         "kswapd_high_wmark_hit_quickly",
@@ -774,20 +756,10 @@ const char * const vmstat_text[] = {
 
         "pgrotated",
 
-#ifdef CONFIG_NUMA_BALANCING
-        "numa_pte_updates",
-        "numa_hint_faults",
-        "numa_hint_faults_local",
-        "numa_pages_migrated",
-#endif
-#ifdef CONFIG_MIGRATION
-        "pgmigrate_success",
-        "pgmigrate_fail",
-#endif
 #ifdef CONFIG_COMPACTION
-        "compact_migrate_scanned",
-        "compact_free_scanned",
-        "compact_isolated",
+        "compact_blocks_moved",
+        "compact_pages_moved",
+        "compact_pagemigrate_failed",
         "compact_stall",
         "compact_fail",
         "compact_success",
@@ -804,6 +776,7 @@ const char * const vmstat_text[] = {
         "unevictable_pgs_munlocked",
         "unevictable_pgs_cleared",
         "unevictable_pgs_stranded",
+        "unevictable_pgs_mlockfreed",
 
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
         "thp_fault_alloc",
@@ -811,8 +784,6 @@ const char * const vmstat_text[] = {
         "thp_collapse_alloc",
         "thp_collapse_alloc_failed",
         "thp_split",
-        "thp_zero_page_alloc",
-        "thp_zero_page_alloc_failed",
 #endif
 
 #endif /* CONFIG_VM_EVENTS_COUNTERS */
@@ -942,7 +913,7 @@ static int pagetypeinfo_show(struct seq_file *m, void *arg)
         pg_data_t *pgdat = (pg_data_t *)arg;
 
         /* check memoryless node */
-        if (!node_state(pgdat->node_id, N_MEMORY))
+        if (!node_state(pgdat->node_id, N_HIGH_MEMORY))
                 return 0;
 
         seq_printf(m, "Page block order: %d\n", pageblock_order);
@@ -1004,16 +975,14 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat,
                    "\n        high     %lu"
                    "\n        scanned  %lu"
                    "\n        spanned  %lu"
-                   "\n        present  %lu"
-                   "\n        managed  %lu",
+                   "\n        present  %lu",
                    zone_page_state(zone, NR_FREE_PAGES),
                    min_wmark_pages(zone),
                    low_wmark_pages(zone),
                    high_wmark_pages(zone),
                    zone->pages_scanned,
                    zone->spanned_pages,
-                   zone->present_pages,
-                   zone->managed_pages);
+                   zone->present_pages);
 
         for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
                 seq_printf(m, "\n    %-12s %lu", vmstat_text[i],
@@ -1183,7 +1152,7 @@ static void __cpuinit start_cpu_timer(int cpu)
 {
         struct delayed_work *work = &per_cpu(vmstat_work, cpu);
 
-        INIT_DEFERRABLE_WORK(work, vmstat_update);
+        INIT_DELAYED_WORK_DEFERRABLE(work, vmstat_update);
         schedule_delayed_work_on(cpu, work, __round_jiffies_relative(HZ, cpu));
 }
 
@@ -1250,6 +1219,7 @@ module_init(setup_vmstat)
 #if defined(CONFIG_DEBUG_FS) && defined(CONFIG_COMPACTION)
 #include <linux/debugfs.h>
 
+static struct dentry *extfrag_debug_root;
 
 /*
  * Return an index indicating how much of the available free memory is
@@ -1306,7 +1276,7 @@ static int unusable_show(struct seq_file *m, void *arg)
         pg_data_t *pgdat = (pg_data_t *)arg;
 
         /* check memoryless node */
-        if (!node_state(pgdat->node_id, N_MEMORY))
+        if (!node_state(pgdat->node_id, N_HIGH_MEMORY))
                 return 0;
 
         walk_zones_in_node(m, pgdat, unusable_show_print);
@@ -1387,24 +1357,19 @@ static const struct file_operations extfrag_file_ops = {
 
 static int __init extfrag_debug_init(void)
 {
-        struct dentry *extfrag_debug_root;
-
         extfrag_debug_root = debugfs_create_dir("extfrag", NULL);
         if (!extfrag_debug_root)
                 return -ENOMEM;
 
         if (!debugfs_create_file("unusable_index", 0444,
                         extfrag_debug_root, NULL, &unusable_file_ops))
-                goto fail;
+                return -ENOMEM;
 
         if (!debugfs_create_file("extfrag_index", 0444,
                         extfrag_debug_root, NULL, &extfrag_file_ops))
-                goto fail;
+                return -ENOMEM;
 
         return 0;
-fail:
-        debugfs_remove_recursive(extfrag_debug_root);
-        return -ENOMEM;
 }
 
 module_init(extfrag_debug_init);