Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce181ebe authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tracing/ftrace' into tracing/core

parents 4a66a82b 89025282

arch/x86/kernel/ftrace.c

+5 −6
Original line number Diff line number Diff line
@@ -133,14 +133,13 @@ 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++;

}