Module Name: src
Committed By: rmind
Date: Mon Apr 11 19:11:08 UTC 2011
Modified Files:
src/sys/arch/vax/vax: genassym.cf
src/sys/kern: kern_mutex.c
Log Message:
G/C unused MUTEX_COUNT_BIAS (it was for VAX)
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/vax/vax/genassym.cf
cvs rdiff -u -r1.50 -r1.51 src/sys/kern/kern_mutex.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/arch/vax/vax/genassym.cf
diff -u src/sys/arch/vax/vax/genassym.cf:1.48 src/sys/arch/vax/vax/genassym.cf:1.49
--- src/sys/arch/vax/vax/genassym.cf:1.48 Mon Dec 20 00:25:45 2010
+++ src/sys/arch/vax/vax/genassym.cf Mon Apr 11 19:11:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.48 2010/12/20 00:25:45 matt Exp $
+# $NetBSD: genassym.cf,v 1.49 2011/04/11 19:11:08 rmind Exp $
#
# Copyright (c) 1997 Ludd, University of Lule}, Sweden.
# All rights reserved.
@@ -170,9 +170,6 @@
define MTX_OWNER offsetof(struct kmutex, mtx_owner)
define MTX_LOCK offsetof(struct kmutex, mtx_lock)
define MTX_IPL offsetof(struct kmutex, mtx_ipl)
-ifdef MUTEX_COUNT_BIAS
-define MTX_COUNT_BIAS MUTEX_COUNT_BIAS
-endif
define RW_OWNER offsetof(struct krwlock, rw_owner)
define RW_HAS_WAITERS RW_HAS_WAITERS
Index: src/sys/kern/kern_mutex.c
diff -u src/sys/kern/kern_mutex.c:1.50 src/sys/kern/kern_mutex.c:1.51
--- src/sys/kern/kern_mutex.c:1.50 Sun Mar 20 23:19:16 2011
+++ src/sys/kern/kern_mutex.c Mon Apr 11 19:11:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_mutex.c,v 1.50 2011/03/20 23:19:16 rmind Exp $ */
+/* $NetBSD: kern_mutex.c,v 1.51 2011/04/11 19:11:08 rmind Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
#define __MUTEX_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_mutex.c,v 1.50 2011/03/20 23:19:16 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_mutex.c,v 1.51 2011/04/11 19:11:08 rmind Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -117,9 +117,6 @@
/*
* Spin mutex SPL save / restore.
*/
-#ifndef MUTEX_COUNT_BIAS
-#define MUTEX_COUNT_BIAS 0
-#endif
#define MUTEX_SPIN_SPLRAISE(mtx) \
do { \
@@ -129,7 +126,7 @@
x__ci = curcpu(); \
x__cnt = x__ci->ci_mtx_count--; \
__insn_barrier(); \
- if (x__cnt == MUTEX_COUNT_BIAS) \
+ if (x__cnt == 0) \
x__ci->ci_mtx_oldspl = (s); \
} while (/* CONSTCOND */ 0)
@@ -138,7 +135,7 @@
struct cpu_info *x__ci = curcpu(); \
int s = x__ci->ci_mtx_oldspl; \
__insn_barrier(); \
- if (++(x__ci->ci_mtx_count) == MUTEX_COUNT_BIAS) \
+ if (++(x__ci->ci_mtx_count) == 0) \
splx(s); \
} while (/* CONSTCOND */ 0)
