From 7e460137635251876ebe7c696b462624428759b8 Mon Sep 17 00:00:00 2001
From: "Kirill A. Shutemov" <kirill@shutemov.name>
Date: Tue, 29 May 2012 15:06:56 -0700
Subject: [PATCH] --- yaml --- r: 308902 b: refs/heads/master c:
 3a7951b4cf8c6be48e20523b724d9188f6c91ba7 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f04013281dcd..e8d1a9c4b899 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92ba39a7acafb4f979fddcd22545603a11c349bb
+refs/heads/master: 3a7951b4cf8c6be48e20523b724d9188f6c91ba7
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
index 5c56765c848a..18becde87577 100644
--- a/trunk/mm/memcontrol.c
+++ b/trunk/mm/memcontrol.c
@@ -304,7 +304,7 @@ struct mem_cgroup {
 	/*
 	 * percpu counter.
 	 */
-	struct mem_cgroup_stat_cpu *stat;
+	struct mem_cgroup_stat_cpu __percpu *stat;
 	/*
 	 * used when a cpu is offlined or other synchronizations
 	 * See mem_cgroup_read_stat().