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))