From 6745ac165b170824ea3ed9e4b9f352c95a082ef5 Mon Sep 17 00:00:00 2001
From: Dimitri Sivanich <sivanich@sgi.com>
Date: Mon, 31 Oct 2011 17:09:46 -0700
Subject: [PATCH] --- yaml --- r: 272169 b: refs/heads/master c:
 a1cb2c60ddc98ff4e5246f410558805401ceee67 h: refs/heads/master i:   272167:
 076aa0ad011a9b56caa9d2a9f336202370ca25ac v: v3

---
 [refs]            | 2 +-
 trunk/mm/vmstat.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f4b62a88efa5..03739edf2f8e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d470fc385defa60d9af610f05db8e7f8b4f2f5e
+refs/heads/master: a1cb2c60ddc98ff4e5246f410558805401ceee67
diff --git a/trunk/mm/vmstat.c b/trunk/mm/vmstat.c
index 56e529a40517..8fd603b1665e 100644
--- a/trunk/mm/vmstat.c
+++ b/trunk/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