forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'tracing/ftrace' into tracing/core

Browse source
This commit is contained in:
Ingo Molnar 2009-01-29 14:27:58 +01:00
commit ce181ebeff
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
arch/x86/kernel/ftrace.c
View file

@ -133,15 +133,14 @@ void ftrace_nmi_exit(void)
static void wait_for_nmi(void)
{
int waited = 0;
if (!atomic_read(&in_nmi))
return;
while (atomic_read(&in_nmi)) {
waited = 1;
do {
cpu_relax();
}
} while(atomic_read(&in_nmi));
if (waited)
nmi_wait_count++;
nmi_wait_count++;
}
static int