diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-25 11:55:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-25 11:55:21 -0700 |
| commit | 35d8d5d47c0ef066197f629f71cdd6039693b86d (patch) | |
| tree | 0156f16eed2f2f91b8b9f65143503ec0efdb1926 /kernel | |
| parent | 1a8cca1880e6127a22cf6604b3c4ccd8b27cbf65 (diff) | |
| parent | 977282ed17a0213c84d59498a1e3f7088e211470 (diff) | |
| download | linux-35d8d5d47c0ef066197f629f71cdd6039693b86d.tar.bz2 | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Thomas Gleixner:
"Three fixlets for perf:
- Return the proper error code if aux buffers for a event are not
supported.
- Calculate the probe offset for inlined functions correctly
- Update the Skylake DTLB load/store miss event so it can count 1G
TLB entries as well"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf probe: Fix probe definition for inlined functions
perf/x86/intel: Add 1G DTLB load/store miss support for SKL
perf/aux: Correct return code of rb_alloc_aux() if !has_aux(ev)
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/events/ring_buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c index 2831480c63a2..ee97196bb151 100644 --- a/kernel/events/ring_buffer.c +++ b/kernel/events/ring_buffer.c @@ -580,7 +580,7 @@ int rb_alloc_aux(struct ring_buffer *rb, struct perf_event *event, int ret = -ENOMEM, max_order = 0; if (!has_aux(event)) - return -ENOTSUPP; + return -EOPNOTSUPP; if (event->pmu->capabilities & PERF_PMU_CAP_AUX_NO_SG) { /* |