Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git] / kernel / timer.c
index efde11e197c4d40f2abd8badd13459e159fdb5cb..6aa6f7e69ad5d59b35d1e266092a709e75f98dee 100644 (file)
@@ -1302,7 +1302,6 @@ void run_local_timers(void)
 {
        hrtimer_run_queues();
        raise_softirq(TIMER_SOFTIRQ);
 {
        hrtimer_run_queues();
        raise_softirq(TIMER_SOFTIRQ);
-       softlockup_tick();
 }
 
 /*
 }
 
 /*