---

yaml --- r: 179735 b: refs/heads/master c: fe43220 h: refs/heads/master i: 179733: a401889 179731: 94bc6f7 179727: f84b1d8 v: v3
git-mirror · Jan 21, 2010 · 973be83 · 973be83
1 parent d4fa743
commit 973be83
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b00eca8cd66029128615e8be9a19e284a950c0f2
+refs/heads/master: fe432200abb0d64f409895168d9ad8fbb9d8e6c6
diff --git a/trunk/kernel/timer.c b/trunk/kernel/timer.c
@@ -1198,6 +1198,7 @@ void update_process_times(int user_tick)
 	run_local_timers();
 	rcu_check_callbacks(cpu, user_tick);
 	printk_tick();
+	perf_event_do_pending();
 	scheduler_tick();
 	run_posix_cpu_timers(p);
 }
@@ -1209,8 +1210,6 @@ static void run_timer_softirq(struct softirq_action *h)
 {
 	struct tvec_base *base = __get_cpu_var(tvec_bases);
 
-	perf_event_do_pending();
-
 	hrtimer_run_pending();
 
 	if (time_after_eq(jiffies, base->timer_jiffies))