---

yaml --- r: 205247 b: refs/heads/master c: ca5135e h: refs/heads/master i: 205245: d4b7b7a 205243: c254545 205239: 1cd1b3a 205231: e7f952a 205215: 861eca0 205183: 2b2bbee v: v3
git-mirror · Jun 9, 2010 · 146a675 · 146a675
1 parent d9c2cb7
commit 146a675
Show file tree

Hide file tree

Showing 3 changed files with 158 additions and 158 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68aa00ac0a82e9a876c799bf6be7622b8f1c8517
+refs/heads/master: ca5135e6b4a3cbc7e187737520fbc4b508f6f7a2
diff --git a/trunk/include/linux/perf_event.h b/trunk/include/linux/perf_event.h
@@ -602,7 +602,7 @@ enum perf_event_active_state {
 
 struct file;
 
-struct perf_mmap_data {
+struct perf_buffer {
 	atomic_t			refcount;
 	struct rcu_head			rcu_head;
 #ifdef CONFIG_PERF_USE_VMALLOC
@@ -727,7 +727,7 @@ struct perf_event {
 	atomic_t			mmap_count;
 	int				mmap_locked;
 	struct user_struct		*mmap_user;
-	struct perf_mmap_data		*data;
+	struct perf_buffer		*buffer;
 
 	/* poll related */
 	wait_queue_head_t		waitq;
@@ -825,7 +825,7 @@ struct perf_cpu_context {
 
 struct perf_output_handle {
 	struct perf_event		*event;
-	struct perf_mmap_data		*data;
+	struct perf_buffer		*buffer;
 	unsigned long			wakeup;
 	unsigned long			size;
 	void				*addr;