Module Name: src
Committed By: matt
Date: Tue Sep 25 05:24:00 UTC 2012
Modified Files:
src/sys/arch/arm/include: mutex.h
Log Message:
Back out 1.12 and include a comment as to why.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/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/arm/include/mutex.h
diff -u src/sys/arch/arm/include/mutex.h:1.12 src/sys/arch/arm/include/mutex.h:1.13
--- src/sys/arch/arm/include/mutex.h:1.12 Fri Aug 31 23:56:15 2012
+++ src/sys/arch/arm/include/mutex.h Tue Sep 25 05:24:00 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.12 2012/08/31 23:56:15 matt Exp $ */
+/* $NetBSD: mutex.h,v 1.13 2012/09/25 05:24:00 matt Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -61,10 +61,15 @@ struct kmutex {
/* Spin mutex */
struct {
+ /*
+ * Since the low bit of mtax_owner is used to flag this
+ * mutex as a spin mutex, we can't use the first byte
+ * or the last byte to store the ipl or lock values.
+ */
volatile uint8_t mtxs_dummy;
ipl_cookie_t mtxs_ipl;
- volatile uint8_t mtxs_unused;
__cpu_simple_lock_t mtxs_lock;
+ volatile uint8_t mtxs_unused;
} s;
} u;
};
