Merge branch 'perf/nmi' into perf/core

[~andy/linux] / kernel / timer.c

diff --git a/kernel/timer.c b/kernel/timer.c
index ee305c8d4e18eb038a54f0f9aea8eb2f353b1f44..c29e2d4d2a665f921b3c3b5bf1177462962770e3 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();
 }
 
 /*