diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-06-04 12:13:06 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-06-04 12:13:06 +0200 |
| commit | 710054ba25c0d1f8f41c22ce13ba336503fb5318 (patch) | |
| tree | f9b09b722bf511841539173d946f90a20fc2e59a /kernel/events | |
| parent | 74c355fbdfedd3820046dba4f537876cea54c207 (diff) | |
| parent | b273fa9716aa1564bee88ceee62f9042981cdc81 (diff) | |
| download | lwn-710054ba25c0d1f8f41c22ce13ba336503fb5318.tar.gz lwn-710054ba25c0d1f8f41c22ce13ba336503fb5318.zip | |
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Diffstat (limited to 'kernel/events')
| -rw-r--r-- | kernel/events/core.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index 8a15944bf9d2..9efe7108ccaf 100644 --- 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; } |