Module Name: src
Committed By: riastradh
Date: Thu Mar 5 15:56:56 UTC 2020
Modified Files:
src/sys/arch/arm/include: mutex.h
src/sys/arch/x86/include: mutex.h
Log Message:
Remove __MUTEX_PRIVATE conditional in definition of struct kmutex.
This doesn't buy us anything but the need to hack around it in
ctfmerge to avoid massive duplication of kernel types -- which only
worked for the x86 definition.
This changes only x86 and arm for now, pending compile-testing the
remaining architectures.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/include/mutex.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/x86/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.21 src/sys/arch/arm/include/mutex.h:1.22
--- src/sys/arch/arm/include/mutex.h:1.21 Fri Nov 29 22:55:33 2019
+++ src/sys/arch/arm/include/mutex.h Thu Mar 5 15:56:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.21 2019/11/29 22:55:33 riastradh Exp $ */
+/* $NetBSD: mutex.h,v 1.22 2020/03/05 15:56:55 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -46,14 +46,6 @@
*
*/
-#ifndef __MUTEX_PRIVATE
-
-struct kmutex {
- uintptr_t mtx_pad1;
-};
-
-#else /* __MUTEX_PRIVATE */
-
struct kmutex {
union {
/* Adaptive mutex */
@@ -74,6 +66,8 @@ struct kmutex {
} u;
};
+#ifdef __MUTEX_PRIVATE
+
#define mtx_owner u.mtxa_owner
#define mtx_ipl u.s.mtxs_ipl
#define mtx_lock u.s.mtxs_lock
Index: src/sys/arch/x86/include/mutex.h
diff -u src/sys/arch/x86/include/mutex.h:1.7 src/sys/arch/x86/include/mutex.h:1.8
--- src/sys/arch/x86/include/mutex.h:1.7 Fri Nov 29 22:55:34 2019
+++ src/sys/arch/x86/include/mutex.h Thu Mar 5 15:56:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.7 2019/11/29 22:55:34 riastradh Exp $ */
+/* $NetBSD: mutex.h,v 1.8 2020/03/05 15:56:55 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2006, 2009 The NetBSD Foundation, Inc.
@@ -35,14 +35,12 @@
struct kmutex {
union {
volatile uintptr_t mtxa_owner;
-#ifdef __MUTEX_PRIVATE
struct {
volatile uint8_t mtxs_dummy;
ipl_cookie_t mtxs_ipl;
__cpu_simple_lock_t mtxs_lock;
volatile uint8_t mtxs_unused;
} s;
-#endif
} u;
};
