X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=include%2Flinux%2Fperf_event.h;h=09cd9c1abfda940b1cf477267e8d7db61eae9703;hb=3cafa9fbb5c1d564b7b8e7224f493effbf04ffee;hp=7098ebbb3b3a1272e4fbb67342f384aac9cbe7c6;hpb=adb8e118f288dc4c569ac9a89010b81a4745fbf0;p=deliverable%2Flinux.git

diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 7098ebbb3b3a..09cd9c1abfda 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -588,8 +588,8 @@ struct perf_mmap_data {
 	struct rcu_head			rcu_head;
 #ifdef CONFIG_PERF_USE_VMALLOC
 	struct work_struct		work;
+	int				page_order;	/* allocation order  */
 #endif
-	int				data_order;	/* allocation order  */
 	int				nr_pages;	/* nr of data pages  */
 	int				writable;	/* are we writable   */
 	int				nr_locked;	/* nr pages mlocked  */
@@ -806,6 +806,9 @@ struct perf_output_handle {
 	unsigned long			head;
 	unsigned long			offset;
 	unsigned long			wakeup;
+	unsigned long			size;
+	void				*addr;
+	int				page;
 	int				nmi;
 	int				sample;
 };