lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'tracing/ftrace' into tracing/core

Browse Source
This commit is contained in:
Ingo Molnar
2009-01-29 14:27:58 +01:00
parent 4a66a82be7 8902528237
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) static void wait_for_nmi(void)
{ {
int waited = 0; if (!atomic_read(&in_nmi))
return;
while (atomic_read(&in_nmi)) { do {
waited = 1;
cpu_relax(); cpu_relax();
} } while(atomic_read(&in_nmi));
if (waited) nmi_wait_count++;
nmi_wait_count++;
} }
static int static int