---

yaml --- r: 277227 b: refs/heads/master c: 77aeeeb h: refs/heads/master i: 277225: c2d48ca 277223: 6fb5ea4 v: v3
git-mirror · Dec 11, 2011 · e6c9568 · e6c9568
1 parent 52aebfc
commit e6c9568
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
 	}