diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2002-01-14 01:56:51 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2002-01-14 01:56:51 +0000 |
| commit | 78a5fb6356970c7ff605ff022dbed5521fdca2fa (patch) | |
| tree | 350d6853679fbae59bf0e578d46f44b3ae946fc2 /sys/arch/macppc | |
| parent | bb6019c6df9f781e59902507fe22bd6e39c04fbc (diff) | |
The return value of lcsplx is used in locore. however at some point
the function was changed to be void. return the cpl value at the
time the function is called as locore.S expects.
Diffstat (limited to 'sys/arch/macppc')
| -rw-r--r-- | sys/arch/macppc/macppc/machdep.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/arch/macppc/macppc/machdep.c b/sys/arch/macppc/macppc/machdep.c index 88dc551b143..0d962c163bb 100644 --- a/sys/arch/macppc/macppc/machdep.c +++ b/sys/arch/macppc/macppc/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.19 2002/01/07 05:31:27 drahn Exp $ */ +/* $OpenBSD: machdep.c,v 1.20 2002/01/14 01:56:50 drahn Exp $ */ /* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */ /* @@ -151,7 +151,7 @@ void ofw_dbg(char *str); caddr_t allocsys __P((caddr_t)); void dumpsys __P((void)); void systype __P((char *name)); -void lcsplx __P((int ipl)); /* called from LCore */ +int lcsplx __P((int ipl)); /* called from LCore */ int power4e_get_eth_addr __P((void)); void nameinterrupt __P((int replace, char *newstr)); void ppc_intr_setup __P((intr_establish_t *establish, @@ -870,11 +870,15 @@ softnet(isr) #include <net/netisr_dispatch.h> } -void +int lcsplx(ipl) int ipl; { + int oldcpl; + + oldcpl = cpl; splx(ipl); + return oldcpl; } /* |