---

yaml --- r: 205323 b: refs/heads/master c: 985023d h: refs/heads/master i: 205321: 079212d 205319: 89f12b2 v: v3
git-mirror · Jul 21, 2010 · 76cf36c · 76cf36c
1 parent 942050c
commit 76cf36c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 {