Module Name: src
Committed By: riastradh
Date: Sun Jul 9 17:03:10 UTC 2023
Modified Files:
src/sys/arch/alpha/include: mutex.h
src/sys/arch/hppa/include: mutex.h
src/sys/arch/ia64/include: mutex.h
src/sys/arch/m68k/include: mutex.h
src/sys/arch/mips/include: mutex.h
src/sys/arch/or1k/include: mutex.h
src/sys/arch/powerpc/include: mutex.h
src/sys/arch/riscv/include: mutex.h
src/sys/arch/sh3/include: mutex.h
src/sys/arch/sparc/include: mutex.h
src/sys/arch/sparc64/include: mutex.h
src/sys/arch/usermode/include: mutex.h
src/sys/arch/vax/include: mutex.h
Log Message:
machine/mutex.h: Sprinkle includes so this can be used by crash(8).
XXX pullup-10
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/alpha/include/mutex.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hppa/include/mutex.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ia64/include/mutex.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/m68k/include/mutex.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mips/include/mutex.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/or1k/include/mutex.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/include/mutex.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/riscv/include/mutex.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sh3/include/mutex.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sparc/include/mutex.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sparc64/include/mutex.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/usermode/include/mutex.h
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/vax/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/include/mutex.h
diff -u src/sys/arch/alpha/include/mutex.h:1.11 src/sys/arch/alpha/include/mutex.h:1.12
--- src/sys/arch/alpha/include/mutex.h:1.11 Wed Aug 25 04:13:41 2021
+++ src/sys/arch/alpha/include/mutex.h Sun Jul 9 17:03:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.11 2021/08/25 04:13:41 thorpej Exp $ */
+/* $NetBSD: mutex.h,v 1.12 2023/07/09 17:03:09 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007 The NetBSD Foundation, Inc.
@@ -40,6 +40,9 @@ struct kmutex {
#else /* __MUTEX_PRIVATE */
+#include <machine/intr.h>
+#include <machine/lock.h>
+
struct kmutex {
union {
volatile uintptr_t mtxa_owner;
Index: src/sys/arch/hppa/include/mutex.h
diff -u src/sys/arch/hppa/include/mutex.h:1.15 src/sys/arch/hppa/include/mutex.h:1.16
--- src/sys/arch/hppa/include/mutex.h:1.15 Tue Jan 7 13:44:23 2020
+++ src/sys/arch/hppa/include/mutex.h Sun Jul 9 17:03:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.15 2020/01/07 13:44:23 ad Exp $ */
+/* $NetBSD: mutex.h,v 1.16 2023/07/09 17:03:09 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -42,7 +42,10 @@
#ifndef __ASSEMBLER__
+#ifdef __MUTEX_PRIVATE
+#include <machine/intr.h>
#include <machine/lock.h>
+#endif
struct kmutex {
union {
Index: src/sys/arch/ia64/include/mutex.h
diff -u src/sys/arch/ia64/include/mutex.h:1.7 src/sys/arch/ia64/include/mutex.h:1.8
--- src/sys/arch/ia64/include/mutex.h:1.7 Wed Apr 6 22:47:57 2022
+++ src/sys/arch/ia64/include/mutex.h Sun Jul 9 17:03:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.7 2022/04/06 22:47:57 riastradh Exp $ */
+/* $NetBSD: mutex.h,v 1.8 2023/07/09 17:03:09 riastradh Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -41,6 +41,9 @@ struct kmutex {
#else
+#include <machine/intr.h>
+#include <machine/lock.h>
+
struct kmutex {
volatile uintptr_t mtx_owner;
ipl_cookie_t mtx_ipl;
Index: src/sys/arch/m68k/include/mutex.h
diff -u src/sys/arch/m68k/include/mutex.h:1.11 src/sys/arch/m68k/include/mutex.h:1.12
--- src/sys/arch/m68k/include/mutex.h:1.11 Wed Aug 25 04:13:41 2021
+++ src/sys/arch/m68k/include/mutex.h Sun Jul 9 17:03:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.11 2021/08/25 04:13:41 thorpej Exp $ */
+/* $NetBSD: mutex.h,v 1.12 2023/07/09 17:03:09 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -40,6 +40,7 @@ struct kmutex {
#else /* __MUTEX_PRIVATE */
+#include <machine/intr.h>
#include <machine/lock.h>
struct kmutex {
Index: src/sys/arch/mips/include/mutex.h
diff -u src/sys/arch/mips/include/mutex.h:1.9 src/sys/arch/mips/include/mutex.h:1.10
--- src/sys/arch/mips/include/mutex.h:1.9 Wed Aug 25 04:13:41 2021
+++ src/sys/arch/mips/include/mutex.h Sun Jul 9 17:03:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.9 2021/08/25 04:13:41 thorpej Exp $ */
+/* $NetBSD: mutex.h,v 1.10 2023/07/09 17:03:09 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -41,9 +41,8 @@ struct kmutex {
#else /* __MUTEX_PRIVATE */
-#ifdef __MUTEX_PRIVATE
+#include <machine/intr.h>
#include <machine/lock.h>
-#endif
struct kmutex {
volatile uintptr_t mtx_owner;
Index: src/sys/arch/or1k/include/mutex.h
diff -u src/sys/arch/or1k/include/mutex.h:1.3 src/sys/arch/or1k/include/mutex.h:1.4
--- src/sys/arch/or1k/include/mutex.h:1.3 Wed Aug 25 04:13:41 2021
+++ src/sys/arch/or1k/include/mutex.h Sun Jul 9 17:03:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.3 2021/08/25 04:13:41 thorpej Exp $ */
+/* $NetBSD: mutex.h,v 1.4 2023/07/09 17:03:09 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -40,6 +40,9 @@ struct kmutex {
#else /* __MUTEX_PRIVATE */
+#include <machine/intr.h>
+#include <machine/lock.h>
+
struct kmutex {
union {
/* Adaptive mutex */
Index: src/sys/arch/powerpc/include/mutex.h
diff -u src/sys/arch/powerpc/include/mutex.h:1.6 src/sys/arch/powerpc/include/mutex.h:1.7
--- src/sys/arch/powerpc/include/mutex.h:1.6 Fri Nov 29 22:55:34 2019
+++ src/sys/arch/powerpc/include/mutex.h Sun Jul 9 17:03:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.6 2019/11/29 22:55:34 riastradh Exp $ */
+/* $NetBSD: mutex.h,v 1.7 2023/07/09 17:03:09 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -33,6 +33,8 @@
#define _POWERPC_MUTEX_H_
#ifdef __MUTEX_PRIVATE
+#include <sys/intr.h>
+#include <machine/intr.h>
#include <machine/lock.h>
#endif
Index: src/sys/arch/riscv/include/mutex.h
diff -u src/sys/arch/riscv/include/mutex.h:1.4 src/sys/arch/riscv/include/mutex.h:1.5
--- src/sys/arch/riscv/include/mutex.h:1.4 Wed Aug 25 04:13:41 2021
+++ src/sys/arch/riscv/include/mutex.h Sun Jul 9 17:03:10 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.4 2021/08/25 04:13:41 thorpej Exp $ */
+/* $NetBSD: mutex.h,v 1.5 2023/07/09 17:03:10 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -40,8 +40,12 @@ struct kmutex {
#else /* __MUTEX_PRIVATE */
+#include <sys/cdefs.h>
+
#include <sys/param.h>
+#include <machine/intr.h>
+
struct kmutex {
volatile uintptr_t mtx_owner;
};
Index: src/sys/arch/sh3/include/mutex.h
diff -u src/sys/arch/sh3/include/mutex.h:1.11 src/sys/arch/sh3/include/mutex.h:1.12
--- src/sys/arch/sh3/include/mutex.h:1.11 Wed Aug 25 04:13:42 2021
+++ src/sys/arch/sh3/include/mutex.h Sun Jul 9 17:03:10 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.11 2021/08/25 04:13:42 thorpej Exp $ */
+/* $NetBSD: mutex.h,v 1.12 2023/07/09 17:03:10 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -40,6 +40,9 @@ struct kmutex {
#else /* __MUTEX_PRIVATE */
+#include <machine/intr.h>
+#include <machine/lock.h>
+
struct kmutex {
union {
/* Adaptive mutex */
Index: src/sys/arch/sparc/include/mutex.h
diff -u src/sys/arch/sparc/include/mutex.h:1.11 src/sys/arch/sparc/include/mutex.h:1.12
--- src/sys/arch/sparc/include/mutex.h:1.11 Fri Nov 29 22:55:34 2019
+++ src/sys/arch/sparc/include/mutex.h Sun Jul 9 17:03:10 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.11 2019/11/29 22:55:34 riastradh Exp $ */
+/* $NetBSD: mutex.h,v 1.12 2023/07/09 17:03:10 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2006 The NetBSD Foundation, Inc.
@@ -33,6 +33,9 @@
#define _SPARC_MUTEX_H_
#ifdef __MUTEX_PRIVATE
+#include <machine/intr.h>
+#include <machine/lock.h>
+
#include "psl.h"
#endif
Index: src/sys/arch/sparc64/include/mutex.h
diff -u src/sys/arch/sparc64/include/mutex.h:1.7 src/sys/arch/sparc64/include/mutex.h:1.8
--- src/sys/arch/sparc64/include/mutex.h:1.7 Wed Aug 25 04:13:41 2021
+++ src/sys/arch/sparc64/include/mutex.h Sun Jul 9 17:03:10 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.7 2021/08/25 04:13:41 thorpej Exp $ */
+/* $NetBSD: mutex.h,v 1.8 2023/07/09 17:03:10 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -32,6 +32,11 @@
#ifndef _SPARC64_MUTEX_H_
#define _SPARC64_MUTEX_H_
+#ifdef __MUTEX_PRIVATE
+#include <machine/intr.h>
+#include <machine/lock.h>
+#endif
+
struct kmutex {
union {
volatile uintptr_t mtxa_owner;
Index: src/sys/arch/usermode/include/mutex.h
diff -u src/sys/arch/usermode/include/mutex.h:1.4 src/sys/arch/usermode/include/mutex.h:1.5
--- src/sys/arch/usermode/include/mutex.h:1.4 Fri Nov 29 22:55:34 2019
+++ src/sys/arch/usermode/include/mutex.h Sun Jul 9 17:03:10 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.4 2019/11/29 22:55:34 riastradh Exp $ */
+/* $NetBSD: mutex.h,v 1.5 2023/07/09 17:03:10 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2006 The NetBSD Foundation, Inc.
@@ -32,6 +32,11 @@
#ifndef _ARCH_USERMODE_INCLUDE_MUTEX_H_
#define _ARCH_USERMODE_INCLUDE_MUTEX_H_
+#ifdef __MUTEX_PRIVATE
+#include <machine/intr.h>
+#include <machine/lock.h>
+#endif
+
struct kmutex {
union {
volatile uintptr_t mtxa_owner;
Index: src/sys/arch/vax/include/mutex.h
diff -u src/sys/arch/vax/include/mutex.h:1.17 src/sys/arch/vax/include/mutex.h:1.18
--- src/sys/arch/vax/include/mutex.h:1.17 Wed Apr 6 22:47:57 2022
+++ src/sys/arch/vax/include/mutex.h Sun Jul 9 17:03:10 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.17 2022/04/06 22:47:57 riastradh Exp $ */
+/* $NetBSD: mutex.h,v 1.18 2023/07/09 17:03:10 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -48,6 +48,9 @@ struct kmutex {
#else /* __MUTEX_PRIVATE */
+#include <machine/intr.h>
+#include <machine/lock.h>
+
struct kmutex {
union {
/* Adaptive mutex */
