Module Name: src
Committed By: thorpej
Date: Wed Jul 14 02:18:10 UTC 2021
Modified Files:
src/sys/arch/alpha/alpha: lock_stubs.s
src/sys/arch/alpha/include: mutex.h
Log Message:
Disable the mutex_spin_{enter,exit}() fast-path stubs while I investigate
some an odd IPL-related panic that seems to be related (that I can fairly
reliabily reproduce on an LCA45).
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/alpha/alpha/lock_stubs.s
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/alpha/include/mutex.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/alpha/lock_stubs.s
diff -u src/sys/arch/alpha/alpha/lock_stubs.s:1.8 src/sys/arch/alpha/alpha/lock_stubs.s:1.9
--- src/sys/arch/alpha/alpha/lock_stubs.s:1.8 Tue Jul 13 13:58:30 2021
+++ src/sys/arch/alpha/alpha/lock_stubs.s Wed Jul 14 02:18:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lock_stubs.s,v 1.8 2021/07/13 13:58:30 thorpej Exp $ */
+/* $NetBSD: lock_stubs.s,v 1.9 2021/07/14 02:18:10 thorpej Exp $ */
/*-
* Copyright (c) 2007, 2021 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: lock_stubs.s,v 1.8 2021/07/13 13:58:30 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lock_stubs.s,v 1.9 2021/07/14 02:18:10 thorpej Exp $");
#include "assym.h"
@@ -114,6 +114,7 @@ LEAF(mutex_exit, 1)
br 1b
END(mutex_exit)
+#if 0 /* XXX disabled for now XXX */
/*
* void mutex_spin_enter(kmutex_t *mtx);
*/
@@ -227,6 +228,7 @@ LEAF(mutex_spin_exit, 1)
1:
RET
END(mutex_spin_exit)
+#endif /* XXX disabled for now XXX */
/*
* void rw_enter(krwlock_t *rwl, krw_t op);
@@ -399,8 +401,10 @@ lock_stub_patch_table:
#if !defined(LOCKDEBUG)
.quad .L_mutex_enter_mb_1
.quad .L_mutex_exit_mb_1
+#if 0 /* XXX disabled for now XXX */
.quad .L_mutex_spin_enter_mb_1
.quad .L_mutex_spin_exit_mb_1
+#endif /* XXX disabled for now XXX */
.quad .L_rw_enter_mb_1
.quad .L_rw_enter_mb_2
.quad .L_rw_tryenter_mb_1
Index: src/sys/arch/alpha/include/mutex.h
diff -u src/sys/arch/alpha/include/mutex.h:1.9 src/sys/arch/alpha/include/mutex.h:1.10
--- src/sys/arch/alpha/include/mutex.h:1.9 Mon Jul 12 15:21:51 2021
+++ src/sys/arch/alpha/include/mutex.h Wed Jul 14 02:18:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.9 2021/07/12 15:21:51 thorpej Exp $ */
+/* $NetBSD: mutex.h,v 1.10 2021/07/14 02:18:10 thorpej Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@ struct kmutex {
#define __HAVE_SIMPLE_MUTEXES 1
#define __HAVE_MUTEX_STUBS 1
-#define __HAVE_SPIN_MUTEX_STUBS 1
+/* XXX #define __HAVE_SPIN_MUTEX_STUBS 1 XXX */
#define MUTEX_CAS(p, o, n) _lock_cas((p), (o), (n))
