diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2009-03-15 19:40:42 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2009-03-15 19:40:42 +0000 |
| commit | be4afdca2a5b4f0324ddb45bb3f51a9ad4bcbed4 (patch) | |
| tree | 7cc7f6b3659d4ba09383a2f37552ffbf1c8add07 /sys/kern | |
| parent | db787728ab081e9d84b26e1a98431526e1420c27 (diff) | |
Introduce splsoftassert(), similar to splassert() but for soft interrupt
levels. This will allow for platforms where soft interrupt levels do not
map to real hardware interrupt levels to have soft ipl values overlapping
hard ipl values without breaking spl asserts.
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/uipc_socket.c | 6 | ||||
| -rw-r--r-- | sys/kern/uipc_socket2.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 7d31306f26d..9841a6396e0 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_socket.c,v 1.75 2009/02/22 07:47:22 otto Exp $ */ +/* $OpenBSD: uipc_socket.c,v 1.76 2009/03/15 19:40:41 miod Exp $ */ /* $NetBSD: uipc_socket.c,v 1.21 1996/02/04 02:17:52 christos Exp $ */ /* @@ -175,7 +175,7 @@ solisten(struct socket *so, int backlog) void sofree(struct socket *so) { - splassert(IPL_SOFTNET); + splsoftassert(IPL_SOFTNET); if (so->so_pcb || (so->so_state & SS_NOFDREF) == 0) return; @@ -258,7 +258,7 @@ discard: int soabort(struct socket *so) { - splassert(IPL_SOFTNET); + splsoftassert(IPL_SOFTNET); return (*so->so_proto->pr_usrreq)(so, PRU_ABORT, NULL, NULL, NULL, curproc); diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c index b7d1097b0ee..7d7f876b486 100644 --- a/sys/kern/uipc_socket2.c +++ b/sys/kern/uipc_socket2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_socket2.c,v 1.46 2009/01/13 13:36:12 blambert Exp $ */ +/* $OpenBSD: uipc_socket2.c,v 1.47 2009/03/15 19:40:41 miod Exp $ */ /* $NetBSD: uipc_socket2.c,v 1.11 1996/02/04 02:17:55 christos Exp $ */ /* @@ -156,7 +156,7 @@ sonewconn(struct socket *head, int connstatus) extern u_long unpst_sendspace, unpst_recvspace; u_long snd_sb_hiwat, rcv_sb_hiwat; - splassert(IPL_SOFTNET); + splsoftassert(IPL_SOFTNET); if (mclpools[0].pr_nout > mclpools[0].pr_hardlimit * 95 / 100) return ((struct socket *)0); |