Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / tools / perf / tests / stat.c

diff --git a/tools/perf/tests/stat.c b/tools/perf/tests/stat.c
index 94250024684a7b890f0308fd4ee0318ef653bc69..cc10b4116c9f960153d3427491b9290442b14a1e 100644 (file)
--- a/tools/perf/tests/stat.c
+++ b/tools/perf/tests/stat.c
@@ -6,7 +6,7 @@
 #include "counts.h"
 #include "debug.h"
 
-static bool has_term(struct stat_config_event *config,
+static bool has_term(struct perf_record_stat_config *config,
                     u64 tag, u64 val)
 {
        unsigned i;
@@ -25,7 +25,7 @@ static int process_stat_config_event(struct perf_tool *tool __maybe_unused,
                                     struct perf_sample *sample __maybe_unused,
                                     struct machine *machine __maybe_unused)
 {
-       struct stat_config_event *config = &event->stat_config;
+       struct perf_record_stat_config *config = &event->stat_config;
        struct perf_stat_config stat_config;
 
 #define HAS(term, val) \
@@ -65,7 +65,7 @@ static int process_stat_event(struct perf_tool *tool __maybe_unused,
                              struct perf_sample *sample __maybe_unused,
                              struct machine *machine __maybe_unused)
 {
-       struct stat_event *st = &event->stat;
+       struct perf_record_stat *st = &event->stat;
 
        TEST_ASSERT_VAL("wrong cpu",    st->cpu    == 1);
        TEST_ASSERT_VAL("wrong thread", st->thread == 2);
@@ -95,7 +95,7 @@ static int process_stat_round_event(struct perf_tool *tool __maybe_unused,
                                    struct perf_sample *sample __maybe_unused,
                                    struct machine *machine __maybe_unused)
 {
-       struct stat_round_event *stat_round = &event->stat_round;
+       struct perf_record_stat_round *stat_round = &event->stat_round;
 
        TEST_ASSERT_VAL("wrong time", stat_round->time == 0xdeadbeef);
        TEST_ASSERT_VAL("wrong type", stat_round->type == PERF_STAT_ROUND_TYPE__INTERVAL);