make spl0() and spllowersoftclock() return void. Also, move spl0()
prototype from param.h to intr.h. (there were some big XXXs in param.h that said to do that, and intr.h is included by param.h, so...)
This commit is contained in:
parent
b8f4f2be87
commit
c2ebb05a74
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: machdep.c,v 1.213 2000/06/05 23:44:55 jhawk Exp $ */
|
||||
/* $NetBSD: machdep.c,v 1.214 2000/06/09 01:40:13 cgd Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
|
||||
|
@ -73,7 +73,7 @@
|
|||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.213 2000/06/05 23:44:55 jhawk Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.214 2000/06/09 01:40:13 cgd Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
@ -1762,7 +1762,7 @@ setregs(p, pack, stack)
|
|||
fpcurproc = NULL;
|
||||
}
|
||||
|
||||
int
|
||||
void
|
||||
spl0()
|
||||
{
|
||||
|
||||
|
@ -1771,7 +1771,7 @@ spl0()
|
|||
softintr_dispatch();
|
||||
}
|
||||
|
||||
return (alpha_pal_swpipl(ALPHA_PSL_IPL_0));
|
||||
(void) alpha_pal_swpipl(ALPHA_PSL_IPL_0);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: intr.h,v 1.28 2000/06/05 21:47:19 thorpej Exp $ */
|
||||
/* $NetBSD: intr.h,v 1.29 2000/06/09 01:40:12 cgd Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2000 The NetBSD Foundation, Inc.
|
||||
|
@ -115,9 +115,16 @@
|
|||
#ifdef _KERNEL
|
||||
|
||||
/* IPL-lowering/restoring macros */
|
||||
#define splx(s) \
|
||||
((s) == ALPHA_PSL_IPL_0 ? spl0() : alpha_pal_swpipl(s))
|
||||
#define spllowersoftclock() alpha_pal_swpipl(ALPHA_PSL_IPL_SOFT)
|
||||
void spl0(void);
|
||||
static __inline void
|
||||
splx(int s)
|
||||
{
|
||||
if (s == ALPHA_PSL_IPL_0)
|
||||
spl0();
|
||||
else
|
||||
alpha_pal_swpipl(s);
|
||||
}
|
||||
#define spllowersoftclock() ((void)alpha_pal_swpipl(ALPHA_PSL_IPL_SOFT))
|
||||
|
||||
/* IPL-raising functions/macros */
|
||||
static __inline int
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: param.h,v 1.28 2000/06/08 03:10:06 thorpej Exp $ */
|
||||
/* $NetBSD: param.h,v 1.29 2000/06/09 01:40:12 cgd Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988 University of Utah.
|
||||
|
@ -162,10 +162,6 @@
|
|||
void delay(unsigned long);
|
||||
#define DELAY(n) delay(n)
|
||||
|
||||
/* XXX THE FOLLOWING PROTOTYPE BELONGS IN INTR.H */
|
||||
int spl0(void); /* drop ipl to zero */
|
||||
/* XXX END INTR.H */
|
||||
|
||||
/* XXX THE FOLLOWING PROTOTYPE SHOULD BE A BUS.H INTERFACE */
|
||||
paddr_t alpha_XXX_dmamap(vaddr_t);
|
||||
/* XXX END BUS.H */
|
||||
|
|
Loading…
Reference in New Issue