1 files changed, 9 insertions, 7 deletions

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 2dd5edf161b7..4f9b247fb312 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -1942,7 +1942,6 @@ int perf_file_header__read(struct perf_file_header *header,
                 else
                         return -1;
         } else if (ph->needs_swap) {
-                unsigned int i;
                 /*
                  * feature bitmap is declared as an array of unsigned longs --
                  * not good since its size can differ between the host that
@@ -1958,14 +1957,17 @@ int perf_file_header__read(struct perf_file_header *header,
                  * file), punt and fallback to the original behavior --
                  * clearing all feature bits and setting buildid.
                  */
-                for (i = 0; i < BITS_TO_LONGS(HEADER_FEAT_BITS); ++i)
-                        header->adds_features[i] = bswap_64(header->adds_features[i]);
+                mem_bswap_64(&header->adds_features,
+                            BITS_TO_U64(HEADER_FEAT_BITS));
 
                 if (!test_bit(HEADER_HOSTNAME, header->adds_features)) {
-                        for (i = 0; i < BITS_TO_LONGS(HEADER_FEAT_BITS); ++i) {
-                                header->adds_features[i] = bswap_64(header->adds_features[i]);
-                                header->adds_features[i] = bswap_32(header->adds_features[i]);
-                        }
+                        /* unswap as u64 */
+                        mem_bswap_64(&header->adds_features,
+                                    BITS_TO_U64(HEADER_FEAT_BITS));
+
+                        /* unswap as u32 */
+                        mem_bswap_32(&header->adds_features,
+                                    BITS_TO_U32(HEADER_FEAT_BITS));
                 }
 
                 if (!test_bit(HEADER_HOSTNAME, header->adds_features)) {