diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-03 14:07:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-03 14:07:45 -0700 |
| commit | e6529f6f58a293fff59fa809ce67cfa063219d73 (patch) | |
| tree | 7157da693413b13c17d30ff5b6f39e418484f142 /arch/x86/kernel | |
| parent | 6553698be05983056f5561cef6aaee0cc6afe7a0 (diff) | |
| parent | c133c7615751008f6c32ccae7cdfc5ff6e989c35 (diff) | |
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()
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/nmi_selftest.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c index 6d9582ec0324..d27f8d84c4ff 100644 --- a/arch/x86/kernel/nmi_selftest.c +++ b/arch/x86/kernel/nmi_selftest.c @@ -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?? */ |