bnx2: Allow user-specified multiple advertisement speed values.

[linux.git] / kernel / timer.c

diff --git a/kernel/timer.c b/kernel/timer.c
index 15533b792397be532ddcce7f2d24c04f78efba75..c61a7949387f93e69b1a4979eff1a03c7e7131b4 100644 (file)
--- a/kernel/timer.c
+++ b/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))