Skip to contentSkip to conversation

perf memswap: Adopt 'struct u64_swap' from evsel.h

tip: perf/urgent tip-bot2 for Arnaldo Carvalho de Melo 1 participant 1 message Sep 20, 2019 1 message not in the archive perf events

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

tip-bot2 for Arnaldo Carvalho de Melo

author merge bot Applied
#1 lore raw

The following commit has been merged into the perf/urgent branch of tip:

Commit-ID:     5cac8ea3e6e736664ee272f94d9099891e25f782
Gitweb:        https://git.kernel.org/tip/5cac8ea3e6e736664ee272f94d9099891e25f782
Author:        Arnaldo Carvalho de Melo <[email protected]>
AuthorDate:    Wed, 18 Sep 2019 12:28:41 -03:00
Committer:     Arnaldo Carvalho de Melo <[email protected]>
CommitterDate: Fri, 20 Sep 2019 09:19:22 -03:00

perf memswap: Adopt 'struct u64_swap' from evsel.h

As it is not used in evsel.h and is a memory swap struct, so fits better in memswap.h.

---
 tools/perf/util/evsel.h   | 5 -----
 tools/perf/util/memswap.h | 7 +++++++
 2 files changed, 7 insertions(+), 5 deletions(-)
tools/perf/util/evsel.h +0 -5
index 68321d1..74df298 100644
@@ -179,11 +179,6 @@ struct evsel {
 	} side_band;
 };
 
-union u64_swap {
-	u64 val64;
-	u32 val32[2];
-};
-
 struct perf_missing_features {
 	bool sample_id_all;
 	bool exclude_guest;
tools/perf/util/memswap.h +7 -0
index 1e29ff9..2c38e8c 100644
@@ -2,6 +2,13 @@
 #ifndef PERF_MEMSWAP_H_
 #define PERF_MEMSWAP_H_
 
+#include <linux/types.h>
+
+union u64_swap {
+	u64 val64;
+	u32 val32[2];
+};
+
 void mem_bswap_64(void *src, int byte_size);
 void mem_bswap_32(void *src, int byte_size);