From 74b604af4caa7414106cc946cbdc635df64b2561 Mon Sep 17 00:00:00 2001
From: "Steven Rostedt (Red Hat)" <srostedt@redhat.com>
Date: Sat, 2 Mar 2013 16:49:10 -0500
Subject: [PATCH] --- yaml --- r: 364921 b: refs/heads/master c:
 34ef61b1fa6172e994e441f1f0241dc53a75bd5f h: refs/heads/master i:   364919:
 bc14a63c9231eb2ea3bd977e097b5a633f3773ce v: v3

---
 [refs]                     | 2 +-
 trunk/kernel/trace/trace.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ed2e61952302..4ac049bca3b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8aae39fc54a2e297698288ac48237cc4c6f83bb
+refs/heads/master: 34ef61b1fa6172e994e441f1f0241dc53a75bd5f
diff --git a/trunk/kernel/trace/trace.h b/trunk/kernel/trace/trace.h
index e420f2a230de..6728a249e817 100644
--- a/trunk/kernel/trace/trace.h
+++ b/trunk/kernel/trace/trace.h
@@ -198,7 +198,7 @@ struct trace_array {
 	struct list_head	systems;
 	struct list_head	events;
 	struct task_struct	*waiter;
-	struct trace_array_cpu	*data;
+	struct trace_array_cpu __percpu	*data;
 };
 
 enum {