Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
mrg 2023-07-12 06:45:24 +00:00
parent bcb8f4b0a3
commit d86bea6109
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/arch/hppa/include/intr.h
View File

@ -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)
{

6
sys/arch/hppa/include/mutex.h
View File

@ -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 */

3
sys/arch/vax/include/mutex.h
View File

@ -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 {