Module Name: src
Committed By: ad
Date: Sun Dec 1 17:06:00 UTC 2019
Modified Files:
src/sys/kern: subr_xcall.c
Log Message:
Back out the fastpath change in xc_wait(). It's going to be done differently.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/kern/subr_xcall.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_xcall.c
diff -u src/sys/kern/subr_xcall.c:1.30 src/sys/kern/subr_xcall.c:1.31
--- src/sys/kern/subr_xcall.c:1.30 Sun Dec 1 16:32:01 2019
+++ src/sys/kern/subr_xcall.c Sun Dec 1 17:06:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_xcall.c,v 1.30 2019/12/01 16:32:01 ad Exp $ */
+/* $NetBSD: subr_xcall.c,v 1.31 2019/12/01 17:06:00 ad Exp $ */
/*-
* Copyright (c) 2007-2010, 2019 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_xcall.c,v 1.30 2019/12/01 16:32:01 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_xcall.c,v 1.31 2019/12/01 17:06:00 ad Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -354,19 +354,11 @@ xc_wait(uint64_t where)
}
/* Block until awoken. */
-#ifdef _LP64 /* Needs 64-bit load/store for atomicity. */
- if (xc->xc_donep < where) {
-#endif
- mutex_enter(&xc->xc_lock);
- while (xc->xc_donep < where) {
- cv_wait(&xc->xc_busy, &xc->xc_lock);
- }
- mutex_exit(&xc->xc_lock);
-#ifdef _LP64
- } else {
- membar_enter();
+ mutex_enter(&xc->xc_lock);
+ while (xc->xc_donep < where) {
+ cv_wait(&xc->xc_busy, &xc->xc_lock);
}
-#endif
+ mutex_exit(&xc->xc_lock);
}
/*
