4 files changed, 6 insertions, 6 deletions

diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index a33b94952e3..7f7cf8539cf 100644
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -68,11 +68,11 @@ struct sample_data {
         u64 addr;
         u64 id;
         u64 stream_id;
-        u32 cpu;
         u64 period;
-        struct ip_callchain *callchain;
+        u32 cpu;
         u32 raw_size;
         void *raw_data;
+        struct ip_callchain *callchain;
 };
 
 #define BUILD_ID_SIZE 20
diff --git a/tools/perf/util/header.h b/tools/perf/util/header.h
index 82a6af72d4c..c059f08cf87 100644
--- a/tools/perf/util/header.h
+++ b/tools/perf/util/header.h
@@ -47,13 +47,13 @@ int perf_file_header__read(struct perf_file_header *self,
 struct perf_header {
         int                     frozen;
         int                     attrs, size;
+        bool                    needs_swap;
         struct perf_header_attr **attr;
         s64                     attr_offset;
         u64                     data_offset;
         u64                     data_size;
         u64                     event_offset;
         u64                     event_size;
-        bool                    needs_swap;
         DECLARE_BITMAP(adds_features, HEADER_FEAT_BITS);
 };
 
diff --git a/tools/perf/util/probe-event.h b/tools/perf/util/probe-event.h
index cd308b0a4d9..9d99fc24c4f 100644
--- a/tools/perf/util/probe-event.h
+++ b/tools/perf/util/probe-event.h
@@ -40,9 +40,9 @@ struct perf_probe_point {
         char            *file;          /* File path */
         char            *function;      /* Function name */
         int             line;           /* Line number */
+        bool            retprobe;       /* Return probe flag */
         char            *lazy_line;     /* Lazy matching pattern */
         unsigned long   offset;         /* Offset from function entry */
-        bool            retprobe;       /* Return probe flag */
 };
 
 /* Perf probe probing argument field chain */
diff --git a/tools/perf/util/probe-finder.h b/tools/perf/util/probe-finder.h
index 3564f22954f..2a271321944 100644
--- a/tools/perf/util/probe-finder.h
+++ b/tools/perf/util/probe-finder.h
@@ -31,13 +31,13 @@ extern int find_line_range(int fd, struct line_range *lr);
 
 struct probe_finder {
         struct perf_probe_event *pev;           /* Target probe event */
-        int                     ntevs;          /* number of trace events */
         struct kprobe_trace_event *tevs;        /* Result trace events */
+        int                     ntevs;          /* number of trace events */
 
         /* For function searching */
+        int                     lno;            /* Line number */
         Dwarf_Addr              addr;           /* Address */
         const char              *fname;         /* Real file name */
-        int                     lno;            /* Line number */
         Dwarf_Die               cu_die;         /* Current CU */
         struct list_head        lcache;         /* Line cache for lazy match */