[src/trunk]: src/sys/arch machine/mutex.h: Sprinkle sys/types.h, omit machine...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch machine/mutex.h: Sprinkle sys/types.h, omit machine...
From: riastradh <riastradh%NetBSD.org@localhost>
Date: Fri, 14 Jul 2023 01:51:14 +0000
details:   https://anonhg.NetBSD.org/src/rev/7a2f930c8809
branches:  trunk
changeset: 377452:7a2f930c8809
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 12 12:50:12 2023 +0000

description:
machine/mutex.h: Sprinkle sys/types.h, omit machine/lock.h.

Turns out machine/lock.h is not needed for __cpu_simple_lock_t, which
always comes from sys/types.h.  And, really, sys/types.h (or at least
sys/stdint.h) is needed for uintN_t and uintptr_t.

diffstat:

 sys/arch/alpha/include/mutex.h    |  5 +++--
 sys/arch/arm/include/mutex.h      |  5 +++--
 sys/arch/hppa/include/mutex.h     |  5 +++--
 sys/arch/ia64/include/mutex.h     |  5 +++--
 sys/arch/m68k/include/mutex.h     |  5 +++--
 sys/arch/mips/include/mutex.h     |  5 +++--
 sys/arch/or1k/include/mutex.h     |  5 +++--
 sys/arch/powerpc/include/mutex.h  |  5 +++--
 sys/arch/riscv/include/mutex.h    |  4 +++-
 sys/arch/sh3/include/mutex.h      |  5 +++--
 sys/arch/sparc/include/mutex.h    |  5 +++--
 sys/arch/sparc64/include/mutex.h  |  5 +++--
 sys/arch/usermode/include/mutex.h |  5 +++--
 sys/arch/vax/include/mutex.h      |  4 +++-
 sys/arch/x86/include/mutex.h      |  8 +++++++-
 15 files changed, 49 insertions(+), 27 deletions(-)

diffs (truncated from 341 to 300 lines):

diff -r 2e0a5e467671 -r 7a2f930c8809 sys/arch/alpha/include/mutex.h
--- a/sys/arch/alpha/include/mutex.h    Wed Jul 12 10:08:11 2023 +0000
+++ b/sys/arch/alpha/include/mutex.h    Wed Jul 12 12:50:12 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mutex.h,v 1.12 2023/07/09 17:03:09 riastradh Exp $     */
+/*     $NetBSD: mutex.h,v 1.13 2023/07/12 12:50:12 riastradh Exp $     */
 
 /*-
  * Copyright (c) 2002, 2006, 2007 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
 #ifndef _ALPHA_MUTEX_H_
 #define        _ALPHA_MUTEX_H_
 
+#include <sys/types.h>
+
 #ifndef __MUTEX_PRIVATE
 
 struct kmutex {
@@ -41,7 +43,6 @@ struct kmutex {
 #else  /* __MUTEX_PRIVATE */
 
 #include <machine/intr.h>
-#include <machine/lock.h>
 
 struct kmutex {
        union {
diff -r 2e0a5e467671 -r 7a2f930c8809 sys/arch/arm/include/mutex.h
--- a/sys/arch/arm/include/mutex.h      Wed Jul 12 10:08:11 2023 +0000
+++ b/sys/arch/arm/include/mutex.h      Wed Jul 12 12:50:12 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mutex.h,v 1.28 2023/07/11 10:41:58 riastradh Exp $     */
+/*     $NetBSD: mutex.h,v 1.29 2023/07/12 12:50:12 riastradh Exp $     */
 
 /*-
  * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -32,9 +32,10 @@
 #ifndef _ARM_MUTEX_H_
 #define        _ARM_MUTEX_H_
 
+#include <sys/types.h>
+
 #ifdef _KERNEL
 #include <machine/intr.h>
-#include <machine/lock.h>
 #endif
 
 /*
diff -r 2e0a5e467671 -r 7a2f930c8809 sys/arch/hppa/include/mutex.h
--- a/sys/arch/hppa/include/mutex.h     Wed Jul 12 10:08:11 2023 +0000
+++ b/sys/arch/hppa/include/mutex.h     Wed Jul 12 12:50:12 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mutex.h,v 1.17 2023/07/12 06:45:24 mrg Exp $   */
+/*     $NetBSD: mutex.h,v 1.18 2023/07/12 12:50:12 riastradh Exp $     */
 
 /*-
  * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -42,9 +42,10 @@
 
 #ifndef __ASSEMBLER__
 
+#include <sys/types.h>
+
 #ifdef __MUTEX_PRIVATE
 #include <machine/intr.h>
-#include <machine/lock.h>
 #endif
 
 struct kmutex {
diff -r 2e0a5e467671 -r 7a2f930c8809 sys/arch/ia64/include/mutex.h
--- a/sys/arch/ia64/include/mutex.h     Wed Jul 12 10:08:11 2023 +0000
+++ b/sys/arch/ia64/include/mutex.h     Wed Jul 12 12:50:12 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mutex.h,v 1.8 2023/07/09 17:03:09 riastradh Exp $      */
+/*     $NetBSD: mutex.h,v 1.9 2023/07/12 12:50:12 riastradh Exp $      */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
 #ifndef _IA64_MUTEX_H_
 #define        _IA64_MUTEX_H_
 
+#include <sys/types.h>
+
 #ifndef __MUTEX_PRIVATE
 
 struct kmutex {
@@ -42,7 +44,6 @@ struct kmutex {
 #else
 
 #include <machine/intr.h>
-#include <machine/lock.h>
 
 struct kmutex {
        volatile uintptr_t      mtx_owner;
diff -r 2e0a5e467671 -r 7a2f930c8809 sys/arch/m68k/include/mutex.h
--- a/sys/arch/m68k/include/mutex.h     Wed Jul 12 10:08:11 2023 +0000
+++ b/sys/arch/m68k/include/mutex.h     Wed Jul 12 12:50:12 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mutex.h,v 1.12 2023/07/09 17:03:09 riastradh Exp $     */
+/*     $NetBSD: mutex.h,v 1.13 2023/07/12 12:50:12 riastradh Exp $     */
 
 /*-
  * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
 #ifndef _M68K_MUTEX_H_
 #define        _M68K_MUTEX_H_
 
+#include <sys/types.h>
+
 #ifndef __MUTEX_PRIVATE
 
 struct kmutex {
@@ -41,7 +43,6 @@ struct kmutex {
 #else  /* __MUTEX_PRIVATE */
 
 #include <machine/intr.h>
-#include <machine/lock.h>
 
 struct kmutex {
        union {
diff -r 2e0a5e467671 -r 7a2f930c8809 sys/arch/mips/include/mutex.h
--- a/sys/arch/mips/include/mutex.h     Wed Jul 12 10:08:11 2023 +0000
+++ b/sys/arch/mips/include/mutex.h     Wed Jul 12 12:50:12 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mutex.h,v 1.10 2023/07/09 17:03:09 riastradh Exp $     */
+/*     $NetBSD: mutex.h,v 1.11 2023/07/12 12:50:12 riastradh Exp $     */
 
 /*-
  * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
 #ifndef _MIPS_MUTEX_H_
 #define        _MIPS_MUTEX_H_
 
+#include <sys/types.h>
+
 #ifndef __MUTEX_PRIVATE
 
 struct kmutex {
@@ -42,7 +44,6 @@ struct kmutex {
 #else  /* __MUTEX_PRIVATE */
 
 #include <machine/intr.h>
-#include <machine/lock.h>
 
 struct kmutex {
        volatile uintptr_t      mtx_owner;
diff -r 2e0a5e467671 -r 7a2f930c8809 sys/arch/or1k/include/mutex.h
--- a/sys/arch/or1k/include/mutex.h     Wed Jul 12 10:08:11 2023 +0000
+++ b/sys/arch/or1k/include/mutex.h     Wed Jul 12 12:50:12 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mutex.h,v 1.4 2023/07/09 17:03:09 riastradh Exp $      */
+/*     $NetBSD: mutex.h,v 1.5 2023/07/12 12:50:12 riastradh Exp $      */
 
 /*-
  * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
 #ifndef _OR1K_MUTEX_H_
 #define        _OR1K_MUTEX_H_
 
+#include <sys/types.h>
+
 #ifndef __MUTEX_PRIVATE
 
 struct kmutex {
@@ -41,7 +43,6 @@ struct kmutex {
 #else  /* __MUTEX_PRIVATE */
 
 #include <machine/intr.h>
-#include <machine/lock.h>
 
 struct kmutex {
        union {
diff -r 2e0a5e467671 -r 7a2f930c8809 sys/arch/powerpc/include/mutex.h
--- a/sys/arch/powerpc/include/mutex.h  Wed Jul 12 10:08:11 2023 +0000
+++ b/sys/arch/powerpc/include/mutex.h  Wed Jul 12 12:50:12 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mutex.h,v 1.7 2023/07/09 17:03:09 riastradh Exp $      */
+/*     $NetBSD: mutex.h,v 1.8 2023/07/12 12:50:13 riastradh Exp $      */
 
 /*-
  * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -32,10 +32,11 @@
 #ifndef _POWERPC_MUTEX_H_
 #define        _POWERPC_MUTEX_H_
 
+#include <sys/types.h>
+
 #ifdef __MUTEX_PRIVATE
 #include <sys/intr.h>
 #include <machine/intr.h>
-#include <machine/lock.h>
 #endif
 
 struct kmutex {
diff -r 2e0a5e467671 -r 7a2f930c8809 sys/arch/riscv/include/mutex.h
--- a/sys/arch/riscv/include/mutex.h    Wed Jul 12 10:08:11 2023 +0000
+++ b/sys/arch/riscv/include/mutex.h    Wed Jul 12 12:50:12 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mutex.h,v 1.5 2023/07/09 17:03:10 riastradh Exp $      */
+/*     $NetBSD: mutex.h,v 1.6 2023/07/12 12:50:13 riastradh Exp $      */
 
 /*-
  * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
 #ifndef _RISCV_MUTEX_H_
 #define        _RISCV_MUTEX_H_
 
+#include <sys/types.h>
+
 #ifndef __MUTEX_PRIVATE
 
 struct kmutex {
diff -r 2e0a5e467671 -r 7a2f930c8809 sys/arch/sh3/include/mutex.h
--- a/sys/arch/sh3/include/mutex.h      Wed Jul 12 10:08:11 2023 +0000
+++ b/sys/arch/sh3/include/mutex.h      Wed Jul 12 12:50:12 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mutex.h,v 1.12 2023/07/09 17:03:10 riastradh Exp $     */
+/*     $NetBSD: mutex.h,v 1.13 2023/07/12 12:50:13 riastradh Exp $     */
 
 /*-
  * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -32,6 +32,8 @@
 #ifndef _SH3_MUTEX_H_
 #define        _SH3_MUTEX_H_
 
+#include <sys/types.h>
+
 #ifndef __MUTEX_PRIVATE
 
 struct kmutex {
@@ -41,7 +43,6 @@ struct kmutex {
 #else  /* __MUTEX_PRIVATE */
 
 #include <machine/intr.h>
-#include <machine/lock.h>
 
 struct kmutex {
        union {
diff -r 2e0a5e467671 -r 7a2f930c8809 sys/arch/sparc/include/mutex.h
--- a/sys/arch/sparc/include/mutex.h    Wed Jul 12 10:08:11 2023 +0000
+++ b/sys/arch/sparc/include/mutex.h    Wed Jul 12 12:50:12 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mutex.h,v 1.12 2023/07/09 17:03:10 riastradh Exp $     */
+/*     $NetBSD: mutex.h,v 1.13 2023/07/12 12:50:13 riastradh Exp $     */
 
 /*-
  * Copyright (c) 2002, 2006 The NetBSD Foundation, Inc.
@@ -32,9 +32,10 @@
 #ifndef _SPARC_MUTEX_H_
 #define        _SPARC_MUTEX_H_
 
+#include <sys/types.h>
+
 #ifdef __MUTEX_PRIVATE
 #include <machine/intr.h>
-#include <machine/lock.h>
 
 #include "psl.h"
 #endif
diff -r 2e0a5e467671 -r 7a2f930c8809 sys/arch/sparc64/include/mutex.h
--- a/sys/arch/sparc64/include/mutex.h  Wed Jul 12 10:08:11 2023 +0000
+++ b/sys/arch/sparc64/include/mutex.h  Wed Jul 12 12:50:12 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mutex.h,v 1.9 2023/07/11 09:34:34 martin Exp $ */
+/*     $NetBSD: mutex.h,v 1.10 2023/07/12 12:50:13 riastradh Exp $     */
 
 /*-
  * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -32,9 +32,10 @@
 #ifndef _SPARC64_MUTEX_H_
 #define        _SPARC64_MUTEX_H_
 
+#include <sys/types.h>
+
 #ifdef __MUTEX_PRIVATE
 #include <machine/intr.h>
-#include <machine/lock.h>
 #include <machine/psl.h>
 #endif
 
diff -r 2e0a5e467671 -r 7a2f930c8809 sys/arch/usermode/include/mutex.h
--- a/sys/arch/usermode/include/mutex.h Wed Jul 12 10:08:11 2023 +0000
+++ b/sys/arch/usermode/include/mutex.h Wed Jul 12 12:50:12 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mutex.h,v 1.5 2023/07/09 17:03:10 riastradh Exp $      */
+/*     $NetBSD: mutex.h,v 1.6 2023/07/12 12:50:13 riastradh Exp $      */
 
 /*-
  * Copyright (c) 2002, 2006 The NetBSD Foundation, Inc.
@@ -32,9 +32,10 @@
 #ifndef _ARCH_USERMODE_INCLUDE_MUTEX_H_
 #define        _ARCH_USERMODE_INCLUDE_MUTEX_H_
 
+#include <sys/types.h>
+
 #ifdef __MUTEX_PRIVATE
 #include <machine/intr.h>
-#include <machine/lock.h>
 #endif
Prev by Date: [src/trunk]: src/usr.bin/xlint/lint1 lint: condense keyword table
Next by Date: [src/trunk]: src/sys/ddb ddb: Cast pointer to uintptr_t, then to db_expr_t.
Previous by Thread: [src/trunk]: src/usr.bin/xlint/lint1 lint: condense keyword table
Next by Thread: [src/trunk]: src/sys/ddb ddb: Cast pointer to uintptr_t, then to db_expr_t.
Indexes:
Home | Main Index | Thread Index | Old Index