Commit e6529f6f authored Jul 03, 2017 by Linus Torvalds

Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 debug update from Ingo Molnar:
 "A single fix for an off-by one bug in test_nmi_ipi() that probably
  doesn't matter in practice"

* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/nmi: Fix timeout test in test_nmi_ipi()

parents 6553698b c133c761

arch/x86/kernel/nmi_selftest.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ static void __init test_nmi_ipi(struct cpumask *mask)

		/* Don't wait longer than a second */
		timeout = USEC_PER_SEC;
		while (!cpumask_empty(mask) && timeout--)
		while (!cpumask_empty(mask) && --timeout)
		udelay(1);

		/* What happens if we timeout, do we still unregister?? */