Module Name: src
Committed By: yamt
Date: Wed Dec 12 14:53:02 UTC 2012
Modified Files:
src/sys/kern: kern_rwlock.c
Log Message:
rw_vector_enter: reload owner in the case of no hand-off.
this fixes crashes in rw_oncpu().
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/kern/kern_rwlock.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/kern_rwlock.c
diff -u src/sys/kern/kern_rwlock.c:1.38 src/sys/kern/kern_rwlock.c:1.39
--- src/sys/kern/kern_rwlock.c:1.38 Sat Feb 25 22:32:44 2012
+++ src/sys/kern/kern_rwlock.c Wed Dec 12 14:53:01 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_rwlock.c,v 1.38 2012/02/25 22:32:44 rmind Exp $ */
+/* $NetBSD: kern_rwlock.c,v 1.39 2012/12/12 14:53:01 yamt Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_rwlock.c,v 1.38 2012/02/25 22:32:44 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_rwlock.c,v 1.39 2012/12/12 14:53:01 yamt Exp $");
#define __RWLOCK_PRIVATE
@@ -394,6 +394,8 @@ rw_vector_enter(krwlock_t *rw, const krw
*/
if (op == RW_READER || (rw->rw_owner & RW_THREAD) == curthread)
break;
+
+ owner = rw->rw_owner;
}
KPREEMPT_ENABLE(curlwp);
