diff options
author | Sean Paul <seanpaul@chromium.org> | 2018-10-24 14:26:04 -0400 |
---|---|---|
committer | Sean Paul <seanpaul@chromium.org> | 2018-10-24 14:26:04 -0400 |
commit | 6542e9adc0da1e23d81ff9314265a029b961906d (patch) | |
tree | 35ba360a7150d8b042a9fd75ab54ef83b34a2b95 /kernel/events/core.c | |
parent | 2b02a05bdc3a62d36e0d0b015351897109e25991 (diff) | |
parent | f2bfc71aee75feff33ca659322b72ffeed5a243d (diff) | |
download | linux-6542e9adc0da1e23d81ff9314265a029b961906d.tar.gz linux-6542e9adc0da1e23d81ff9314265a029b961906d.tar.bz2 linux-6542e9adc0da1e23d81ff9314265a029b961906d.zip |
Merge drm/drm-next into drm-misc-next
4.19 is out, Lyude asked for a backmerge, and it's been a while. All
very good reasons on their own :-)
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'kernel/events/core.c')
-rw-r--r-- | kernel/events/core.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index c80549bf82c6..dcb093e7b377 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -3935,6 +3935,12 @@ int perf_event_read_local(struct perf_event *event, u64 *value, goto out; } + /* If this is a pinned event it must be running on this CPU */ + if (event->attr.pinned && event->oncpu != smp_processor_id()) { + ret = -EBUSY; + goto out; + } + /* * If the event is currently on this CPU, its either a per-task event, * or local to this CPU. Furthermore it means its ACTIVE (otherwise |