TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'perf/nmi' into perf/core

Browse Source 
Conflicts:
	kernel/Makefile

Merge reason: Add the now complete topic, fix the conflict.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2010-08-05 08:45:05 +02:00
parent 12a81c8df1 eb703f9819
commit 61be7fdec2
16 changed files with 770 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
kernel/timer.c
View File

@@ -1289,7 +1289,6 @@ void run_local_timers(void)
{
hrtimer_run_queues();
raise_softirq(TIMER_SOFTIRQ);
softlockup_tick();
}
/*