perf: Cleanup for HAVE_SYNC_COMPARE_AND_SWAP_SUPPORT

[linux-2.6-microblaze.git] / tools / perf / util / auxtrace.c

diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c
index 9350eeb..f33f09b 100644 (file)
--- a/tools/perf/util/auxtrace.c
+++ b/tools/perf/util/auxtrace.c
@@ -73,8 +73,8 @@ static int evlist__regroup(struct evlist *evlist, struct evsel *leader, struct e
        grp = false;
        evlist__for_each_entry(evlist, evsel) {
                if (grp) {
-                       if (!(evsel->leader == leader ||
-                            (evsel->leader == evsel &&
+                       if (!(evsel__leader(evsel) == leader ||
+                            (evsel__leader(evsel) == evsel &&
                              evsel->core.nr_members <= 1)))
                                return -EINVAL;
                } else if (evsel == leader) {
@@ -87,8 +87,8 @@ static int evlist__regroup(struct evlist *evlist, struct evsel *leader, struct e
        grp = false;
        evlist__for_each_entry(evlist, evsel) {
                if (grp) {
-                       if (evsel->leader != leader) {
-                               evsel->leader = leader;
+                       if (!evsel__has_leader(evsel, leader)) {
+                               evsel__set_leader(evsel, leader);
                                if (leader->core.nr_members < 1)
                                        leader->core.nr_members = 1;
                                leader->core.nr_members += 1;
@@ -130,11 +130,6 @@ int auxtrace_mmap__mmap(struct auxtrace_mmap *mm,
                return 0;
        }
 
-#if BITS_PER_LONG != 64 && !defined(HAVE_SYNC_COMPARE_AND_SWAP_SUPPORT)
-       pr_err("Cannot use AUX area tracing mmaps\n");
-       return -1;
-#endif
-
        pc->aux_offset = mp->offset;
        pc->aux_size = mp->len;
 
@@ -1231,11 +1226,11 @@ static void unleader_evsel(struct evlist *evlist, struct evsel *leader)
 
        /* Find new leader for the group */
        evlist__for_each_entry(evlist, evsel) {
-               if (evsel->leader != leader || evsel == leader)
+               if (!evsel__has_leader(evsel, leader) || evsel == leader)
                        continue;
                if (!new_leader)
                        new_leader = evsel;
-               evsel->leader = new_leader;
+               evsel__set_leader(evsel, new_leader);
        }
 
        /* Update group information */
@@ -1686,14 +1681,11 @@ static int __auxtrace_mmap__read(struct mmap *map,
        union perf_event ev;
        void *data1, *data2;
 
-       if (snapshot) {
-               head = auxtrace_mmap__read_snapshot_head(mm);
-               if (auxtrace_record__find_snapshot(itr, mm->idx, mm, data,
-                                                  &head, &old))
-                       return -1;
-       } else {
-               head = auxtrace_mmap__read_head(mm);
-       }
+       head = auxtrace_mmap__read_head(mm);
+
+       if (snapshot &&
+           auxtrace_record__find_snapshot(itr, mm->idx, mm, data, &head, &old))
+               return -1;
 
        if (old == head)
                return 0;