diff --git a/[refs] b/[refs] index 9d591aa6da3f..f816667f8380 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f09fc688936705b2020ca247df39ee27283668a +refs/heads/master: 33b07b8be7f0e1e8e4184e3473d71f174e4b0641 diff --git a/trunk/kernel/events/core.c b/trunk/kernel/events/core.c index a6a9ec4cd8f5..9789a56b7d54 100644 --- a/trunk/kernel/events/core.c +++ b/trunk/kernel/events/core.c @@ -5350,7 +5350,7 @@ static enum hrtimer_restart perf_swevent_hrtimer(struct hrtimer *hrtimer) if (regs && !perf_exclude_event(event, regs)) { if (!(event->attr.exclude_idle && is_idle_task(current))) - if (perf_event_overflow(event, &data, regs)) + if (__perf_event_overflow(event, 1, &data, regs)) ret = HRTIMER_NORESTART; }