diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-03-02 15:45:49 +0100 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2015-03-02 15:45:49 +0100 |
commit | 33be4ef116511f1079c4c3bf4b5547faf7439301 (patch) | |
tree | ce074111ea317b6c9f0274c2aecd513ce78353a3 /tools/perf/util/evlist.h | |
parent | Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
parent | Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
download | linux-33be4ef116511f1079c4c3bf4b5547faf7439301.tar.xz linux-33be4ef116511f1079c4c3bf4b5547faf7439301.zip |
Merge 'tip/perf/urgent' into perf/core to pick fixes
Needed to build perf/core buildable in some cases.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/evlist.h')
-rw-r--r-- | tools/perf/util/evlist.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h index d4768a30f884..f07c984465f0 100644 --- a/tools/perf/util/evlist.h +++ b/tools/perf/util/evlist.h @@ -28,7 +28,7 @@ struct perf_mmap { int mask; int refcnt; unsigned int prev; - char event_copy[PERF_SAMPLE_MAX_SIZE]; + char event_copy[PERF_SAMPLE_MAX_SIZE] __attribute__((aligned(8))); }; struct perf_evlist { |