diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-05-16 13:43:09 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-05-16 13:43:09 +0200 |
| commit | 08a60f7c5a87877ea47943683142cf9cbb44183e (patch) | |
| tree | 3997fcbb3764225efade09d5beb75905c9187a6f /kernel/timer.c | |
| parent | 1c183115ab81f16ce1c702321aae40bca1b38b6c (diff) | |
| parent | cafcd80d216bc2136b8edbb794327e495792c666 (diff) | |
Merge branch 'perf/nmi' into auto-latest
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 9199f3c52215..89a5fffc6997 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -1284,7 +1284,6 @@ void run_local_timers(void) { hrtimer_run_queues(); raise_softirq(TIMER_SOFTIRQ); - softlockup_tick(); } /* |