[src/trunk]: src/sys/arch machine/mutex.h: Sprinkle includes so this can be u...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch machine/mutex.h: Sprinkle includes so this can be u...
From: riastradh <riastradh%NetBSD.org@localhost>
Date: Sun, 09 Jul 2023 22:33:27 +0000
details:   https://anonhg.NetBSD.org/src/rev/574c8ed59223
branches:  trunk
changeset: 377377:574c8ed59223
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Jul 09 17:03:09 2023 +0000

description:
machine/mutex.h: Sprinkle includes so this can be used by crash(8).

XXX pullup-10

diffstat:

 sys/arch/alpha/include/mutex.h    |  5 ++++-
 sys/arch/hppa/include/mutex.h     |  5 ++++-
 sys/arch/ia64/include/mutex.h     |  5 ++++-
 sys/arch/m68k/include/mutex.h     |  3 ++-
 sys/arch/mips/include/mutex.h     |  5 ++---
 sys/arch/or1k/include/mutex.h     |  5 ++++-
 sys/arch/powerpc/include/mutex.h  |  4 +++-
 sys/arch/riscv/include/mutex.h    |  6 +++++-
 sys/arch/sh3/include/mutex.h      |  5 ++++-
 sys/arch/sparc/include/mutex.h    |  5 ++++-
 sys/arch/sparc64/include/mutex.h  |  7 ++++++-
 sys/arch/usermode/include/mutex.h |  7 ++++++-
 sys/arch/vax/include/mutex.h      |  5 ++++-
 13 files changed, 52 insertions(+), 15 deletions(-)

diffs (253 lines):

diff -r 776998e7afb7 -r 574c8ed59223 sys/arch/alpha/include/mutex.h
--- a/sys/arch/alpha/include/mutex.h    Sun Jul 09 16:32:28 2023 +0000
+++ b/sys/arch/alpha/include/mutex.h    Sun Jul 09 17:03:09 2023 +0000
@@ -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;
diff -r 776998e7afb7 -r 574c8ed59223 sys/arch/hppa/include/mutex.h
--- a/sys/arch/hppa/include/mutex.h     Sun Jul 09 16:32:28 2023 +0000
+++ b/sys/arch/hppa/include/mutex.h     Sun Jul 09 17:03:09 2023 +0000
@@ -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 {
diff -r 776998e7afb7 -r 574c8ed59223 sys/arch/ia64/include/mutex.h
--- a/sys/arch/ia64/include/mutex.h     Sun Jul 09 16:32:28 2023 +0000
+++ b/sys/arch/ia64/include/mutex.h     Sun Jul 09 17:03:09 2023 +0000
@@ -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;
diff -r 776998e7afb7 -r 574c8ed59223 sys/arch/m68k/include/mutex.h
--- a/sys/arch/m68k/include/mutex.h     Sun Jul 09 16:32:28 2023 +0000
+++ b/sys/arch/m68k/include/mutex.h     Sun Jul 09 17:03:09 2023 +0000
@@ -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 {
diff -r 776998e7afb7 -r 574c8ed59223 sys/arch/mips/include/mutex.h
--- a/sys/arch/mips/include/mutex.h     Sun Jul 09 16:32:28 2023 +0000
+++ b/sys/arch/mips/include/mutex.h     Sun Jul 09 17:03:09 2023 +0000
@@ -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;
diff -r 776998e7afb7 -r 574c8ed59223 sys/arch/or1k/include/mutex.h
--- a/sys/arch/or1k/include/mutex.h     Sun Jul 09 16:32:28 2023 +0000
+++ b/sys/arch/or1k/include/mutex.h     Sun Jul 09 17:03:09 2023 +0000
@@ -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 */
diff -r 776998e7afb7 -r 574c8ed59223 sys/arch/powerpc/include/mutex.h
--- a/sys/arch/powerpc/include/mutex.h  Sun Jul 09 16:32:28 2023 +0000
+++ b/sys/arch/powerpc/include/mutex.h  Sun Jul 09 17:03:09 2023 +0000
@@ -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
 
diff -r 776998e7afb7 -r 574c8ed59223 sys/arch/riscv/include/mutex.h
--- a/sys/arch/riscv/include/mutex.h    Sun Jul 09 16:32:28 2023 +0000
+++ b/sys/arch/riscv/include/mutex.h    Sun Jul 09 17:03:09 2023 +0000
@@ -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;
 };
diff -r 776998e7afb7 -r 574c8ed59223 sys/arch/sh3/include/mutex.h
--- a/sys/arch/sh3/include/mutex.h      Sun Jul 09 16:32:28 2023 +0000
+++ b/sys/arch/sh3/include/mutex.h      Sun Jul 09 17:03:09 2023 +0000
@@ -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 */
diff -r 776998e7afb7 -r 574c8ed59223 sys/arch/sparc/include/mutex.h
--- a/sys/arch/sparc/include/mutex.h    Sun Jul 09 16:32:28 2023 +0000
+++ b/sys/arch/sparc/include/mutex.h    Sun Jul 09 17:03:09 2023 +0000
@@ -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
 
diff -r 776998e7afb7 -r 574c8ed59223 sys/arch/sparc64/include/mutex.h
--- a/sys/arch/sparc64/include/mutex.h  Sun Jul 09 16:32:28 2023 +0000
+++ b/sys/arch/sparc64/include/mutex.h  Sun Jul 09 17:03:09 2023 +0000
@@ -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;
diff -r 776998e7afb7 -r 574c8ed59223 sys/arch/usermode/include/mutex.h
--- a/sys/arch/usermode/include/mutex.h Sun Jul 09 16:32:28 2023 +0000
+++ b/sys/arch/usermode/include/mutex.h Sun Jul 09 17:03:09 2023 +0000
@@ -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;
diff -r 776998e7afb7 -r 574c8ed59223 sys/arch/vax/include/mutex.h
--- a/sys/arch/vax/include/mutex.h      Sun Jul 09 16:32:28 2023 +0000
+++ b/sys/arch/vax/include/mutex.h      Sun Jul 09 17:03:09 2023 +0000
@@ -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 */
Prev by Date: [src/trunk]: src/sys/sys sys/rwlock.h: Make this more self-contained for bool.
Next by Date: [src/trunk]: src/usr.sbin/crash ddb: New `show all tstiles' command.
Previous by Thread: [src/trunk]: src/sys/sys sys/rwlock.h: Make this more self-contained for bool.
Next by Thread: [src/trunk]: src/usr.sbin/crash ddb: New `show all tstiles' command.
Indexes:
Home | Main Index | Thread Index | Old Index