Message ID | 1314349177-31003-3-git-send-email-apw@canonical.com |
---|---|
State | New |
Headers | show |
diff --git a/kernel/perf_event.c b/kernel/perf_event.c index fa8123e..720b764 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c @@ -3985,12 +3985,8 @@ static int __perf_event_overflow(struct perf_event *event, int nmi, if (events && atomic_dec_and_test(&event->event_limit)) { ret = 1; event->pending_kill = POLL_HUP; - if (nmi) { - event->pending_disable = 1; - perf_pending_queue(&event->pending, - perf_pending_event); - } else - perf_event_disable(event); + event->pending_disable = 1; + perf_pending_queue(&event->pending, perf_pending_event); } if (event->overflow_handler)