diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-29 14:27:58 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-29 14:27:58 +0100 |
| commit | ce181ebeff398e7d1a9c6cb92eb035a6d2d07489 (patch) | |
| tree | 01cb4853ed1c76c61eed4cc631bf38b3768060aa | |
| parent | 4a66a82be78e1b6f9f83074423bf42a52251414c (diff) | |
| parent | 890252823766e562301e61340f3187a14033d045 (diff) | |
Merge branch 'tracing/ftrace' into tracing/core
| -rw-r--r-- | arch/x86/kernel/ftrace.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index 1b43086b097..4d33224c055 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c @@ -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 |