Module Name: src
Committed By: riastradh
Date: Wed Jul 12 12:50:13 UTC 2023
Modified Files:
src/sys/arch/alpha/include: mutex.h
src/sys/arch/arm/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
src/sys/arch/x86/include: mutex.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/alpha/include/mutex.h
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arm/include/mutex.h
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hppa/include/mutex.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/ia64/include/mutex.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/m68k/include/mutex.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mips/include/mutex.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/or1k/include/mutex.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/include/mutex.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/riscv/include/mutex.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sh3/include/mutex.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sparc/include/mutex.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sparc64/include/mutex.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/usermode/include/mutex.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/vax/include/mutex.h
cvs rdiff -u -r1.9 -r1.10 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/alpha/include/mutex.h
diff -u src/sys/arch/alpha/include/mutex.h:1.12 src/sys/arch/alpha/include/mutex.h:1.13
--- src/sys/arch/alpha/include/mutex.h:1.12 Sun Jul 9 17:03:09 2023
+++ src/sys/arch/alpha/include/mutex.h Wed Jul 12 12:50:12 2023
@@ -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 {
Index: src/sys/arch/arm/include/mutex.h
diff -u src/sys/arch/arm/include/mutex.h:1.28 src/sys/arch/arm/include/mutex.h:1.29
--- src/sys/arch/arm/include/mutex.h:1.28 Tue Jul 11 10:41:58 2023
+++ src/sys/arch/arm/include/mutex.h Wed Jul 12 12:50:12 2023
@@ -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
/*
Index: src/sys/arch/hppa/include/mutex.h
diff -u src/sys/arch/hppa/include/mutex.h:1.17 src/sys/arch/hppa/include/mutex.h:1.18
--- src/sys/arch/hppa/include/mutex.h:1.17 Wed Jul 12 06:45:24 2023
+++ src/sys/arch/hppa/include/mutex.h Wed Jul 12 12:50:12 2023
@@ -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 {
Index: src/sys/arch/ia64/include/mutex.h
diff -u src/sys/arch/ia64/include/mutex.h:1.8 src/sys/arch/ia64/include/mutex.h:1.9
--- src/sys/arch/ia64/include/mutex.h:1.8 Sun Jul 9 17:03:09 2023
+++ src/sys/arch/ia64/include/mutex.h Wed Jul 12 12:50:12 2023
@@ -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;
Index: src/sys/arch/m68k/include/mutex.h
diff -u src/sys/arch/m68k/include/mutex.h:1.12 src/sys/arch/m68k/include/mutex.h:1.13
--- src/sys/arch/m68k/include/mutex.h:1.12 Sun Jul 9 17:03:09 2023
+++ src/sys/arch/m68k/include/mutex.h Wed Jul 12 12:50:12 2023
@@ -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 {
Index: src/sys/arch/mips/include/mutex.h
diff -u src/sys/arch/mips/include/mutex.h:1.10 src/sys/arch/mips/include/mutex.h:1.11
--- src/sys/arch/mips/include/mutex.h:1.10 Sun Jul 9 17:03:09 2023
+++ src/sys/arch/mips/include/mutex.h Wed Jul 12 12:50:12 2023
@@ -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;
Index: src/sys/arch/or1k/include/mutex.h
diff -u src/sys/arch/or1k/include/mutex.h:1.4 src/sys/arch/or1k/include/mutex.h:1.5
--- src/sys/arch/or1k/include/mutex.h:1.4 Sun Jul 9 17:03:09 2023
+++ src/sys/arch/or1k/include/mutex.h Wed Jul 12 12:50:12 2023
@@ -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 {
Index: src/sys/arch/powerpc/include/mutex.h
diff -u src/sys/arch/powerpc/include/mutex.h:1.7 src/sys/arch/powerpc/include/mutex.h:1.8
--- src/sys/arch/powerpc/include/mutex.h:1.7 Sun Jul 9 17:03:09 2023
+++ src/sys/arch/powerpc/include/mutex.h Wed Jul 12 12:50:13 2023
@@ -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 {
Index: src/sys/arch/riscv/include/mutex.h
diff -u src/sys/arch/riscv/include/mutex.h:1.5 src/sys/arch/riscv/include/mutex.h:1.6
--- src/sys/arch/riscv/include/mutex.h:1.5 Sun Jul 9 17:03:10 2023
+++ src/sys/arch/riscv/include/mutex.h Wed Jul 12 12:50:13 2023
@@ -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 {
Index: src/sys/arch/sh3/include/mutex.h
diff -u src/sys/arch/sh3/include/mutex.h:1.12 src/sys/arch/sh3/include/mutex.h:1.13
--- src/sys/arch/sh3/include/mutex.h:1.12 Sun Jul 9 17:03:10 2023
+++ src/sys/arch/sh3/include/mutex.h Wed Jul 12 12:50:13 2023
@@ -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 {
Index: src/sys/arch/sparc/include/mutex.h
diff -u src/sys/arch/sparc/include/mutex.h:1.12 src/sys/arch/sparc/include/mutex.h:1.13
--- src/sys/arch/sparc/include/mutex.h:1.12 Sun Jul 9 17:03:10 2023
+++ src/sys/arch/sparc/include/mutex.h Wed Jul 12 12:50:13 2023
@@ -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
Index: src/sys/arch/sparc64/include/mutex.h
diff -u src/sys/arch/sparc64/include/mutex.h:1.9 src/sys/arch/sparc64/include/mutex.h:1.10
--- src/sys/arch/sparc64/include/mutex.h:1.9 Tue Jul 11 09:34:34 2023
+++ src/sys/arch/sparc64/include/mutex.h Wed Jul 12 12:50:13 2023
@@ -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
Index: src/sys/arch/usermode/include/mutex.h
diff -u src/sys/arch/usermode/include/mutex.h:1.5 src/sys/arch/usermode/include/mutex.h:1.6
--- src/sys/arch/usermode/include/mutex.h:1.5 Sun Jul 9 17:03:10 2023
+++ src/sys/arch/usermode/include/mutex.h Wed Jul 12 12:50:13 2023
@@ -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
struct kmutex {
Index: src/sys/arch/vax/include/mutex.h
diff -u src/sys/arch/vax/include/mutex.h:1.19 src/sys/arch/vax/include/mutex.h:1.20
--- src/sys/arch/vax/include/mutex.h:1.19 Wed Jul 12 06:45:24 2023
+++ src/sys/arch/vax/include/mutex.h Wed Jul 12 12:50:13 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.19 2023/07/12 06:45:24 mrg Exp $ */
+/* $NetBSD: mutex.h,v 1.20 2023/07/12 12:50:13 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -40,6 +40,8 @@
* and (if MP) using BBSSI/BBCCI to lock out the other processors.
*/
+#include <sys/types.h>
+
#ifndef __MUTEX_PRIVATE
struct kmutex {
Index: src/sys/arch/x86/include/mutex.h
diff -u src/sys/arch/x86/include/mutex.h:1.9 src/sys/arch/x86/include/mutex.h:1.10
--- src/sys/arch/x86/include/mutex.h:1.9 Thu Mar 5 17:58:08 2020
+++ src/sys/arch/x86/include/mutex.h Wed Jul 12 12:50:13 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.9 2020/03/05 17:58:08 riastradh Exp $ */
+/* $NetBSD: mutex.h,v 1.10 2023/07/12 12:50:13 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2006, 2009 The NetBSD Foundation, Inc.
@@ -32,6 +32,12 @@
#ifndef _X86_MUTEX_H_
#define _X86_MUTEX_H_
+#include <sys/types.h>
+
+#ifdef _KERNEL
+#include <machine/intr.h>
+#endif
+
struct kmutex {
union {
volatile uintptr_t mtxa_owner;
