Merge branch 'perf/nmi' into perf/core

[cascardo/linux.git] / kernel / timer.c

diff --git a/kernel/timer.c b/kernel/timer.c
index ee305c8..c29e2d4 100644 (file)
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1289,7 +1289,6 @@ void run_local_timers(void)
 {
        hrtimer_run_queues();
        raise_softirq(TIMER_SOFTIRQ);
-       softlockup_tick();
 }
 
 /*