diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-08-05 08:45:05 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-08-05 08:45:05 +0200 |
| commit | 61be7fdec2f51b99570cd5dcc30c7848c8e56513 (patch) | |
| tree | 4a73ee635bc3e35dc54f75caddd26ffb6238bb5c /kernel/timer.c | |
| parent | Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/opr... (diff) | |
| parent | kernel/watchdog: Initialize 'result' (diff) | |
| download | linux-61be7fdec2f51b99570cd5dcc30c7848c8e56513.tar.xz linux-61be7fdec2f51b99570cd5dcc30c7848c8e56513.zip | |
Merge branch 'perf/nmi' into perf/core
Conflicts:
kernel/Makefile
Merge reason: Add the now complete topic, fix the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 ee305c8d4e18..c29e2d4d2a66 100644 --- 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(); } /* |