diff options
| author |   visa <visa@openbsd.org> | 2017-07-25 03:46:59 +0000 |
|---|---|---|
| committer | visa <visa@openbsd.org> | 2017-07-25 03:46:59 +0000 |
| commit | 381f9e5221afc61d661d8012d3bd9baedd46ebdb (patch) | |
| tree | e8dbed09a2b2d36faed0804e68b8ab1c4a6318f3 | |
| parent | Fix off-by-one error introduced in the previous commit. (diff) | |
| download | wireguard-openbsd-381f9e5221afc61d661d8012d3bd9baedd46ebdb.tar.xz wireguard-openbsd-381f9e5221afc61d661d8012d3bd9baedd46ebdb.zip | |
Remove leftovers of a past softintr mechanism.
OK mpi@, kettenis@
| -rw-r--r-- | sys/arch/octeon/include/intr.h | 7 | ||||
| -rw-r--r-- | sys/arch/powerpc/include/intr.h | 6 | ||||
| -rw-r--r-- | sys/arch/powerpc/powerpc/softintr.c | 4 |
3 files changed, 3 insertions, 14 deletions
diff --git a/sys/arch/octeon/include/intr.h b/sys/arch/octeon/include/intr.h index 1b905f83840..03a195e1ab3 100644 --- a/sys/arch/octeon/include/intr.h +++ b/sys/arch/octeon/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.12 2017/06/18 13:58:45 visa Exp $ */ +/* $OpenBSD: intr.h,v 1.13 2017/07/25 03:46:59 visa Exp $ */ /* * Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -112,11 +112,6 @@ void *softintr_establish(int, void (*)(void *), void *); void softintr_init(void); void softintr_schedule(void *); -/* XXX For legacy software interrupts. */ -extern struct soft_intrhand *softnet_intrhand; - -#define setsoftnet() softintr_schedule(softnet_intrhand) - #define splsoft() splraise(IPL_SOFTINT) #define splbio() splraise(IPL_BIO) #define splnet() splraise(IPL_NET) diff --git a/sys/arch/powerpc/include/intr.h b/sys/arch/powerpc/include/intr.h index 7ddcfafda04..d0b3f727c4d 100644 --- a/sys/arch/powerpc/include/intr.h +++ b/sys/arch/powerpc/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.52 2015/09/13 14:06:40 kettenis Exp $ */ +/* $OpenBSD: intr.h,v 1.53 2017/07/25 03:46:59 visa Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom, Opsycon AB and RTMX Inc, USA. @@ -155,10 +155,6 @@ void softintr_init(void); void softintr_schedule(void *); void dosoftint(int); -#define setsoftclock() set_sint(SI_TO_IRQBIT(SI_SOFTCLOCK)) -#define setsoftnet() set_sint(SI_TO_IRQBIT(SI_SOFTNET)) -#define setsofttty() set_sint(SI_TO_IRQBIT(SI_SOFTTTY)) - #define splhigh() splraise(IPL_HIGH) #define spl0() spllower(IPL_NONE) diff --git a/sys/arch/powerpc/powerpc/softintr.c b/sys/arch/powerpc/powerpc/softintr.c index 5b40afc07fd..42ddf896362 100644 --- a/sys/arch/powerpc/powerpc/softintr.c +++ b/sys/arch/powerpc/powerpc/softintr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softintr.c,v 1.8 2015/09/06 17:43:42 deraadt Exp $ */ +/* $OpenBSD: softintr.c,v 1.9 2017/07/25 03:46:59 visa Exp $ */ /* $NetBSD: softintr.c,v 1.2 2003/07/15 00:24:39 lukem Exp $ */ /* @@ -47,8 +47,6 @@ struct soft_intrq soft_intrq[SI_NQUEUES]; -struct soft_intrhand *softnet_intrhand; - /* * Initialize the software interrupt system. */ |