diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-31 09:02:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-31 09:02:51 -0800 |
| commit | aafd9d6a46745926648cb5d0b68b108e79ceb8d4 (patch) | |
| tree | b099dece2ff08e57d141af686ffbb24dc663c05b /kernel/softirq.c | |
| parent | 595bf999e3a864f40e049c67c42ecee50fb7a78a (diff) | |
| parent | a2b4c607c93a0850c8e3d90688cf3bd08576b986 (diff) | |
| download | op-kernel-dev-aafd9d6a46745926648cb5d0b68b108e79ceb8d4.zip op-kernel-dev-aafd9d6a46745926648cb5d0b68b108e79ceb8d4.tar.gz | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer/dynticks updates from Ingo Molnar:
"This tree contains misc dynticks updates: a fix and three cleanups"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched/nohz: Fix overflow error in scheduler_tick_max_deferment()
nohz_full: fix code style issue of tick_nohz_full_stop_tick
nohz: Get timekeeping max deferment outside jiffies_lock
tick: Rename tick_check_idle() to tick_irq_enter()
Diffstat (limited to 'kernel/softirq.c')
| -rw-r--r-- | kernel/softirq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index 8509670..490fcbb 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -328,7 +328,7 @@ void irq_enter(void) * here, as softirq will be serviced on return from interrupt. */ local_bh_disable(); - tick_check_idle(); + tick_irq_enter(); _local_bh_enable(); } |
