From e6c9568cc120836d62d72bdf47add118af3bbbe7 Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" Date: Thu, 10 Nov 2011 16:02:52 -0800 Subject: [PATCH] --- yaml --- r: 277227 b: refs/heads/master c: 77aeeebd7b5483582d0eb6e3fd2894771d1fd8e5 h: refs/heads/master i: 277225: c2d48ca0b986f22f0a7f0e259c433210b6cd91a2 277223: 6fb5ea4a3764d6e7d20c88325198243cbf4c218c v: v3 --- [refs] | 2 +- trunk/kernel/events/core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5a1113dd25cd..6c6ac09bbd5f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7fc20c5cbdd184f32cb0f886f1a069f123f5787a +refs/heads/master: 77aeeebd7b5483582d0eb6e3fd2894771d1fd8e5 diff --git a/trunk/kernel/events/core.c b/trunk/kernel/events/core.c index d3b9df5962c2..923c6b5667db 100644 --- a/trunk/kernel/events/core.c +++ b/trunk/kernel/events/core.c @@ -5362,7 +5362,7 @@ static enum hrtimer_restart perf_swevent_hrtimer(struct hrtimer *hrtimer) regs = get_irq_regs(); if (regs && !perf_exclude_event(event, regs)) { - if (!(event->attr.exclude_idle && current->pid == 0)) + if (!(event->attr.exclude_idle && is_idle_task(current))) if (perf_event_overflow(event, &data, regs)) ret = HRTIMER_NORESTART; }