diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2014-01-25 08:27:26 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-01-25 08:27:26 +0100 |
| commit | a2b4c607c93a0850c8e3d90688cf3bd08576b986 (patch) | |
| tree | fd1ef8cd906a864f6db3551b3891fd5d0c2075fd /kernel/softirq.c | |
| parent | Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| parent | sched/nohz: Fix overflow error in scheduler_tick_max_deferment() (diff) | |
| download | wireguard-linux-a2b4c607c93a0850c8e3d90688cf3bd08576b986.tar.xz wireguard-linux-a2b4c607c93a0850c8e3d90688cf3bd08576b986.zip | |
Merge branch 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into timers/urgent
Pull dynticks cleanups from Frederic Weisbecker.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 8a1e6e104892..991e38d9f71e 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -326,7 +326,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(); } |