diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2008-10-20 13:28:56 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-10-20 13:28:56 +0200 |
| commit | b6a4b7de4cb45ccf7157fc58de09c96f84d67108 (patch) | |
| tree | 016630974bdcb00fe529b673f96d389e0fd6dc94 /kernel/timer.c | |
| parent | hrtimers: fix typo (diff) | |
| parent | Merge commit 'linus/master' into merge-linus (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-hrtimer into timers/range-hrtimers
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 1 |
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) run_local_timers(); if (rcu_pending(cpu)) rcu_check_callbacks(cpu, user_tick); + printk_tick(); scheduler_tick(); run_posix_cpu_timers(p); } |