diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-02-13 08:36:18 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-02-13 08:36:18 +0100 |
| commit | cae45e1c6c541283a1bd155aa7b0a57e353b4df4 (patch) | |
| tree | ba87fdd6b47cb2937fc1b6d69ef0595a08646556 /kernel/time | |
| parent | aa0c38cf39de73bf7360a3da8f1707601261e518 (diff) | |
| parent | e7ffb4eb9a6d89678e7f62461737899f88dab64e (diff) | |
| download | lwn-cae45e1c6c541283a1bd155aa7b0a57e353b4df4.tar.gz lwn-cae45e1c6c541283a1bd155aa7b0a57e353b4df4.zip | |
Merge branch 'rcu-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull the latest RCU tree from Paul E. McKenney:
- Additional cleanups after RCU flavor consolidation
- Grace-period forward-progress cleanups and improvements
- Documentation updates
- Miscellaneous fixes
- spin_is_locked() conversions to lockdep
- SPDX changes to RCU source and header files
- SRCU updates
- Torture-test updates, including nolibc updates and moving
nolibc to tools/include
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/time')
| -rw-r--r-- | kernel/time/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 444156debfa0..6eb7cc4b6d52 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1632,7 +1632,7 @@ void update_process_times(int user_tick) /* Note: this timer irq context must be accounted for as well. */ account_process_tick(p, user_tick); run_local_timers(); - rcu_check_callbacks(user_tick); + rcu_sched_clock_irq(user_tick); #ifdef CONFIG_IRQ_WORK if (in_irq()) irq_work_tick(); |