From 973be83e0dbda3162fbb6f8280894c33bd34806c Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Mon, 18 Jan 2010 09:08:26 +0100 Subject: [PATCH] --- yaml --- r: 179735 b: refs/heads/master c: fe432200abb0d64f409895168d9ad8fbb9d8e6c6 h: refs/heads/master i: 179733: a40188910e2799f73d1b89901a9eb46c580d24bf 179731: 94bc6f77521c26b8ef8e95a839b89a8700f2f64d 179727: f84b1d8129f38835570353d9091bc0544fb292ee v: v3 --- [refs] | 2 +- trunk/kernel/timer.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7139ef1d134f..2ab0d0d94086 100644 --- 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 index 15533b792397..c61a7949387f 100644 --- 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))