diff options
author | Clark Williams <williams@redhat.com> | 2012-02-23 21:33:05 -0600 |
---|---|---|
committer | Clark Williams <williams@redhat.com> | 2012-02-23 21:33:05 -0600 |
commit | a0c034c3726715d1928b301ddd43c51799c0c07a (patch) | |
tree | 76e78b4646ca0560d8cd0ee041a8bde9a5269c8c /tools | |
parent | 086290148fc37d7f2eccb7026b18fb9539ec7820 (diff) | |
parent | 9d0231c207faeda051cf54c1a64e1a147d2187fa (diff) |
Merge commit 'v3.2.7' into rt-3.2.7-rt13v3.2.7-rt13
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/bench/mem-memcpy-x86-64-asm.S | 6 | ||||
-rw-r--r-- | tools/perf/util/evsel.c | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/tools/perf/bench/mem-memcpy-x86-64-asm.S b/tools/perf/bench/mem-memcpy-x86-64-asm.S index a57b66e853c2..185a96d66dd1 100644 --- a/tools/perf/bench/mem-memcpy-x86-64-asm.S +++ b/tools/perf/bench/mem-memcpy-x86-64-asm.S @@ -1,2 +1,8 @@ #include "../../../arch/x86/lib/memcpy_64.S" +/* + * We need to provide note.GNU-stack section, saying that we want + * NOT executable stack. Otherwise the final linking will assume that + * the ELF stack should not be restricted at all and set it RWX. + */ +.section .note.GNU-stack,"",@progbits diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index d7915d4e77cb..efca198589e6 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -390,6 +390,7 @@ int perf_event__parse_sample(const union perf_event *event, u64 type, data->cpu = data->pid = data->tid = -1; data->stream_id = data->id = data->time = -1ULL; + data->period = 1; if (event->header.type != PERF_RECORD_SAMPLE) { if (!sample_id_all) |