---

yaml
---
r: 140855
b: refs/heads/master
c: 4f3640f
h: refs/heads/master
i:
  140853: 0675cc6
  140851: 2c59301
  140847: adc9016
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e543ad76914abec1acf6631604a4154cd7a2ca6b
+refs/heads/master: 4f3640f8a358f2183a8c966f299eeb55ca523e06

trunk/kernel/trace/ring_buffer.c

@@ -2461,6 +2461,7 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
 	unsigned long flags;
 	unsigned int commit;
 	unsigned int read;
+	u64 save_timestamp;
 	int ret = -1;
 
 	/*
@@ -2515,6 +2516,9 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
 		if (len < size)
 			goto out;
 
+		/* save the current timestamp, since the user will need it */
+		save_timestamp = cpu_buffer->read_stamp;
+
 		/* Need to copy one event at a time */
 		do {
 			memcpy(bpage->data + pos, rpage->data + rpos, size);
@@ -2531,7 +2535,7 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
 
 		/* update bpage */
 		local_set(&bpage->commit, pos);
-		bpage->time_stamp = rpage->time_stamp;
+		bpage->time_stamp = save_timestamp;
 
 		/* we copied everything to the beginning */
 		read = 0;