Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / mm / vmstat.c

diff --git a/mm/vmstat.c b/mm/vmstat.c
index d52b13d28e8f4b25b827cd386693330655ff9174..8fd603b1665e5be65bc10c93f146b860f706925d 100644 (file)
--- 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];
+atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
 EXPORT_SYMBOL(vm_stat);
 
 #ifdef CONFIG_SMP
@@ -702,6 +702,7 @@ 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",