diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2019-10-05 15:44:58 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2019-10-05 15:44:58 +0000 |
| commit | 8ebcc8b46e4c55f7422462ffc1aad2062eb231df (patch) | |
| tree | 72966000dc2250d0e2375d09df894aba424450a8 /sys/arch | |
| parent | 76fff977c457ced6e47de785fffa704747dcb6da (diff) | |
Use mask to extract IPL; should have been part of the earlier diff that
added IPI support on armv7.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/armv7/broadcom/bcm2836_intr.c | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/intc.c | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/sunxi/sxiintc.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/armv7/broadcom/bcm2836_intr.c b/sys/arch/armv7/broadcom/bcm2836_intr.c index 27028a08b76..f2bba3dc626 100644 --- a/sys/arch/armv7/broadcom/bcm2836_intr.c +++ b/sys/arch/armv7/broadcom/bcm2836_intr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bcm2836_intr.c,v 1.3 2017/04/30 16:45:45 mpi Exp $ */ +/* $OpenBSD: bcm2836_intr.c,v 1.4 2019/10/05 15:44:57 kettenis Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org> * Copyright (c) 2015 Patrick Wildt <patrick@blueri.se> @@ -525,7 +525,7 @@ bcm_intc_intr_establish(int irqno, int level, int (*func)(void *), ih = malloc(sizeof *ih, M_DEVBUF, M_WAITOK); ih->ih_fun = func; ih->ih_arg = arg; - ih->ih_ipl = level; + ih->ih_ipl = level & IPL_IRQMASK; ih->ih_irq = irqno; ih->ih_name = name; diff --git a/sys/arch/armv7/omap/intc.c b/sys/arch/armv7/omap/intc.c index 2b334395a42..6ac04281d12 100644 --- a/sys/arch/armv7/omap/intc.c +++ b/sys/arch/armv7/omap/intc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intc.c,v 1.8 2019/05/06 03:45:58 mlarkin Exp $ */ +/* $OpenBSD: intc.c,v 1.9 2019/10/05 15:44:57 kettenis Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org> * @@ -367,7 +367,7 @@ intc_intr_establish(int irqno, int level, int (*func)(void *), ih = malloc(sizeof(*ih), M_DEVBUF, M_WAITOK); ih->ih_func = func; ih->ih_arg = arg; - ih->ih_ipl = level; + ih->ih_ipl = level & IPL_IRQMASK; ih->ih_irq = irqno; ih->ih_name = name; diff --git a/sys/arch/armv7/sunxi/sxiintc.c b/sys/arch/armv7/sunxi/sxiintc.c index 2f0384a28b2..07363154104 100644 --- a/sys/arch/armv7/sunxi/sxiintc.c +++ b/sys/arch/armv7/sunxi/sxiintc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sxiintc.c,v 1.5 2019/05/06 03:49:53 mlarkin Exp $ */ +/* $OpenBSD: sxiintc.c,v 1.6 2019/10/05 15:44:57 kettenis Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org> * Copyright (c) 2013 Artturi Alm @@ -390,7 +390,7 @@ sxiintc_intr_establish(int irq, int level, int (*func)(void *), ih = malloc(sizeof(*ih), M_DEVBUF, M_WAITOK); ih->ih_func = func; ih->ih_arg = arg; - ih->ih_ipl = level; + ih->ih_ipl = level & IPL_IRQMASK; ih->ih_irq = irq; ih->ih_name = name; |