summaryrefslogtreecommitdiffstats
path: root/kernel/softirq.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2014-01-25 08:27:26 +0100
committerIngo Molnar <mingo@kernel.org>2014-01-25 08:27:26 +0100
commita2b4c607c93a0850c8e3d90688cf3bd08576b986 (patch)
treefd1ef8cd906a864f6db3551b3891fd5d0c2075fd /kernel/softirq.c
parent15c81026204da897a05424c79263aea861a782cc (diff)
parent8fe8ff09ce3b5750e1f3e45a1f4a81d59c7ff1f1 (diff)
downloadlinux-a2b4c607c93a0850c8e3d90688cf3bd08576b986.tar.gz
linux-a2b4c607c93a0850c8e3d90688cf3bd08576b986.tar.bz2
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.c2
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();
}