[src/trunk]: src/sys/kern KERNEL_LOCK(9): Restore backoff while spinning in !...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1d0bdd03764f
branches:  trunk
changeset: 370035:1d0bdd03764f
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Tue Sep 13 09:14:26 2022 +0000

description:
KERNEL_LOCK(9): Restore backoff while spinning in !LOCKDEBUG case.

When the spinout logic was put under LOCKDEBUG among a series of
other changes that got reverted, the backoff was inadvertently made
LOCKDEBUG-only too.

diffstat:

 sys/kern/kern_lock.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r 11f6ceaf4f76 -r 1d0bdd03764f sys/kern/kern_lock.c
--- a/sys/kern/kern_lock.c      Tue Sep 13 09:13:19 2022 +0000
+++ b/sys/kern/kern_lock.c      Tue Sep 13 09:14:26 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_lock.c,v 1.178 2022/08/20 23:37:12 riastradh Exp $        */
+/*     $NetBSD: kern_lock.c,v 1.179 2022/09/13 09:14:26 riastradh Exp $        */
 
 /*-
  * Copyright (c) 2002, 2006, 2007, 2008, 2009, 2020 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_lock.c,v 1.178 2022/08/20 23:37:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_lock.c,v 1.179 2022/09/13 09:14:26 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_lockdebug.h"
@@ -264,9 +264,9 @@
                                kpreempt_enable();
                                _KERNEL_LOCK_ABORT("spinout");
                        }
+#endif
                        SPINLOCK_BACKOFF_HOOK;
                        SPINLOCK_SPIN_HOOK;
-#endif
                }
                s = splvm();
        } while (!__cpu_simple_lock_try(kernel_lock));