From 76cf36c8e6db866191925cca9bc66660386c2f00 Mon Sep 17 00:00:00 2001
From: Richard Kennedy <richard@rsk.demon.co.uk>
Date: Thu, 25 Mar 2010 11:27:36 +0000
Subject: [PATCH] --- yaml --- r: 205323 b: refs/heads/master c:
 985023dee6e212493831431ba2e3ce8918f001b2 h: refs/heads/master i:   205321:
 079212d62a1aab4c6530f05b1638b34c01abea10   205319:
 89f12b2bf6ab452854e9e1d725f44f01068f1ce5 v: v3

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

diff --git a/[refs] b/[refs]
index 69a4bb196582..759e96e4d8da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e870e9a1240bcef1157ffaaf71dac63362e71904
+refs/heads/master: 985023dee6e212493831431ba2e3ce8918f001b2
diff --git a/trunk/kernel/trace/ring_buffer.c b/trunk/kernel/trace/ring_buffer.c
index 28d0615a513f..3632ce87674f 100644
--- a/trunk/kernel/trace/ring_buffer.c
+++ b/trunk/kernel/trace/ring_buffer.c
@@ -443,6 +443,7 @@ int ring_buffer_print_page_header(struct trace_seq *s)
  */
 struct ring_buffer_per_cpu {
 	int				cpu;
+	atomic_t			record_disabled;
 	struct ring_buffer		*buffer;
 	spinlock_t			reader_lock;	/* serialize readers */
 	arch_spinlock_t			lock;
@@ -462,7 +463,6 @@ struct ring_buffer_per_cpu {
 	unsigned long			read;
 	u64				write_stamp;
 	u64				read_stamp;
-	atomic_t			record_disabled;
 };
 
 struct ring_buffer {