Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

[firefly-linux-kernel-4.4.55.git] / kernel / events / core.c

diff --git a/kernel/events/core.c b/kernel/events/core.c
index c09767f7db3e20e4a510c7a51fba7d662e967659..d863b3c057bba8fe4add3e774a3bb86083c493a5 100644 (file)
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -5028,6 +5028,14 @@ static int __perf_event_overflow(struct perf_event *event, int nmi,
        else
                perf_event_output(event, nmi, data, regs);
 
+       if (event->fasync && event->pending_kill) {
+               if (nmi) {
+                       event->pending_wakeup = 1;
+                       irq_work_queue(&event->pending);
+               } else
+                       perf_event_wakeup(event);
+       }
+
        return ret;
 }