Module Name: src
Committed By: mrg
Date: Wed Jul 12 06:45:24 UTC 2023
Modified Files:
src/sys/arch/hppa/include: intr.h mutex.h
src/sys/arch/vax/include: mutex.h
Log Message:
fix hppa and vax builds.
machine/lock.h isn't necessary for __cpu_simple_lock_t, it's in
sys/types.h. avoids cpu_data.h vs sched.h include order issues.
move the hppa ipl_t typedef with the moved usage of it.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hppa/include/intr.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hppa/include/mutex.h
cvs rdiff -u -r1.18 -r1.19 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/hppa/include/intr.h
diff -u src/sys/arch/hppa/include/intr.h:1.3 src/sys/arch/hppa/include/intr.h:1.4
--- src/sys/arch/hppa/include/intr.h:1.3 Tue Jul 11 11:05:09 2023
+++ src/sys/arch/hppa/include/intr.h Wed Jul 12 06:45:24 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.3 2023/07/11 11:05:09 riastradh Exp $ */
+/* $NetBSD: intr.h,v 1.4 2023/07/12 06:45:24 mrg Exp $ */
/* $OpenBSD: intr.h,v 1.26 2009/12/29 13:11:40 jsing Exp $ */
/*-
@@ -41,6 +41,7 @@
#ifndef _LOCORE
#if defined(_KERNEL) || defined(_KMEMUSER)
+typedef int ipl_t;
typedef struct {
ipl_t _ipl;
} ipl_cookie_t;
@@ -162,8 +163,6 @@ void spllower(int);
#define spl0() spllower(0)
#define splx(x) spllower(x)
-typedef int ipl_t;
-
static inline ipl_cookie_t
makeiplcookie(ipl_t ipl)
{
Index: src/sys/arch/hppa/include/mutex.h
diff -u src/sys/arch/hppa/include/mutex.h:1.16 src/sys/arch/hppa/include/mutex.h:1.17
--- src/sys/arch/hppa/include/mutex.h:1.16 Sun Jul 9 17:03:09 2023
+++ src/sys/arch/hppa/include/mutex.h Wed Jul 12 06:45:24 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.16 2023/07/09 17:03:09 riastradh Exp $ */
+/* $NetBSD: mutex.h,v 1.17 2023/07/12 06:45:24 mrg Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -85,7 +85,7 @@ struct kmutex {
#define MUTEX_SPIN_FLAG 0xffffff10
#define MUTEX_UNOWNED_OR_SPIN(x) (((x) & 0xffffffef) == 0xffffff00)
-#ifndef __ASSEMBLER__
+#if !defined(__ASSEMBLER__) && defined(_KERNEL)
static inline uintptr_t
MUTEX_OWNER(uintptr_t owner)
@@ -180,7 +180,7 @@ MUTEX_CLEAR_WAITERS(struct kmutex *mtx)
mtx->mtx_waiters = 0;
}
-#endif /* __ASSEMBLER__ */
+#endif /* !__ASSEMBLER__ && _KERNEL */
#endif /* __MUTEX_PRIVATE */
Index: src/sys/arch/vax/include/mutex.h
diff -u src/sys/arch/vax/include/mutex.h:1.18 src/sys/arch/vax/include/mutex.h:1.19
--- src/sys/arch/vax/include/mutex.h:1.18 Sun Jul 9 17:03:10 2023
+++ src/sys/arch/vax/include/mutex.h Wed Jul 12 06:45:24 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mutex.h,v 1.18 2023/07/09 17:03:10 riastradh Exp $ */
+/* $NetBSD: mutex.h,v 1.19 2023/07/12 06:45:24 mrg Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -49,7 +49,6 @@ struct kmutex {
#else /* __MUTEX_PRIVATE */
#include <machine/intr.h>
-#include <machine/lock.h>
struct kmutex {
union {
