Merge remote-tracking branch 'torvalds/master' into perf/core

[linux-2.6-microblaze.git] / tools / perf / util / cs-etm.h

diff --git a/tools/perf/util/cs-etm.h b/tools/perf/util/cs-etm.h
index 3642891..d65c7b1 100644 (file)
--- a/tools/perf/util/cs-etm.h
+++ b/tools/perf/util/cs-etm.h
@@ -171,8 +171,8 @@ struct cs_etm_packet_queue {
        u32 head;
        u32 tail;
        u32 instr_count;
-       u64 timestamp;
-       u64 next_timestamp;
+       u64 cs_timestamp;
+       u64 next_cs_timestamp;
        struct cs_etm_packet packet_buffer[CS_ETM_PACKET_MAX_BUFFER];
 };