aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/timer.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-17 05:20:52 -0400
committerIngo Molnar <mingo@elte.hu>2008-10-17 05:20:52 -0400
commit52f4f324c727e77507ae0490b08fc92e140ba57d (patch)
treec560a04a8c2025bf5e4a556d5ff0e86252a842db /kernel/timer.c
parent3baf63a507094992a5bf238ba3bcea71f458b1e8 (diff)
parent2e532d68a2b3e2aa6b19731501222069735c741c (diff)
Merge branch 'linus' into core/urgent
Diffstat (limited to 'kernel/timer.c')
-rw-r--r--kernel/timer.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/timer.c b/kernel/timer.c
index 03bc7f1f1593..510fe69351ca 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -978,6 +978,7 @@ void update_process_times(int user_tick)
978 run_local_timers(); 978 run_local_timers();
979 if (rcu_pending(cpu)) 979 if (rcu_pending(cpu))
980 rcu_check_callbacks(cpu, user_tick); 980 rcu_check_callbacks(cpu, user_tick);
981 printk_tick();
981 scheduler_tick(); 982 scheduler_tick();
982 run_posix_cpu_timers(p); 983 run_posix_cpu_timers(p);
983} 984}