diff options
| -rw-r--r-- | sys/arch/arm/arm/fault.c | 6 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/intc.c | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/omap/intc.h | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/sunxi/sxiintc.c | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/sunxi/sxiintc.h | 4 |
5 files changed, 5 insertions, 17 deletions
diff --git a/sys/arch/arm/arm/fault.c b/sys/arch/arm/arm/fault.c index 62afab6e6e8..dfc0450467b 100644 --- a/sys/arch/arm/arm/fault.c +++ b/sys/arch/arm/arm/fault.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fault.c,v 1.47 2023/01/05 20:35:44 kettenis Exp $ */ +/* $OpenBSD: fault.c,v 1.48 2024/04/29 12:33:17 jsg Exp $ */ /* $NetBSD: fault.c,v 1.46 2004/01/21 15:39:21 skrll Exp $ */ /* @@ -95,10 +95,6 @@ #include <arm/db_machdep.h> #include <arm/machdep.h> #include <arm/vfp.h> - -#ifdef DEBUG -int last_fault_code; /* For the benefit of pmap_fault_fixup() */ -#endif struct sigdata { int signo; diff --git a/sys/arch/armv7/omap/intc.c b/sys/arch/armv7/omap/intc.c index 67de5ba0bce..4c4fe605579 100644 --- a/sys/arch/armv7/omap/intc.c +++ b/sys/arch/armv7/omap/intc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intc.c,v 1.12 2022/01/03 03:06:50 jsg Exp $ */ +/* $OpenBSD: intc.c,v 1.13 2024/04/29 12:33:17 jsg Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org> * @@ -91,8 +91,6 @@ struct intrq { int iq_ist; /* share type */ }; -volatile int softint_pending; - struct intrq intc_handler[INTC_MAX_IRQ]; u_int32_t intc_smask[NIPL]; u_int32_t intc_imask[INTC_MAX_BANKS][NIPL]; diff --git a/sys/arch/armv7/omap/intc.h b/sys/arch/armv7/omap/intc.h index ae87b085b07..c5d5880290e 100644 --- a/sys/arch/armv7/omap/intc.h +++ b/sys/arch/armv7/omap/intc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intc.h,v 1.5 2024/04/29 12:24:46 jsg Exp $ */ +/* $OpenBSD: intc.h,v 1.6 2024/04/29 12:33:17 jsg Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org> * @@ -25,8 +25,6 @@ #include <machine/intr.h> #include <arm/softintr.h> -extern volatile int softint_pending; - #define SI_TO_IRQBIT(si) (1U<<(si)) void intc_setipl(int new); void intc_splx(int new); diff --git a/sys/arch/armv7/sunxi/sxiintc.c b/sys/arch/armv7/sunxi/sxiintc.c index 9764a635d27..112cbf5f6de 100644 --- a/sys/arch/armv7/sunxi/sxiintc.c +++ b/sys/arch/armv7/sunxi/sxiintc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sxiintc.c,v 1.11 2022/01/03 03:06:50 jsg Exp $ */ +/* $OpenBSD: sxiintc.c,v 1.12 2024/04/29 12:33:17 jsg Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org> * Copyright (c) 2013 Artturi Alm @@ -131,8 +131,6 @@ struct intrq { int iq_ist; /* share type */ }; -volatile int a1xsoftint_pending; - struct intrq sxiintc_handler[NIRQ]; u_int32_t sxiintc_smask[NIPL]; u_int32_t sxiintc_imask[NBANKS][NIPL]; diff --git a/sys/arch/armv7/sunxi/sxiintc.h b/sys/arch/armv7/sunxi/sxiintc.h index d738ccbd233..a18a2d849c5 100644 --- a/sys/arch/armv7/sunxi/sxiintc.h +++ b/sys/arch/armv7/sunxi/sxiintc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sxiintc.h,v 1.3 2024/04/29 12:24:46 jsg Exp $ */ +/* $OpenBSD: sxiintc.h,v 1.4 2024/04/29 12:33:17 jsg Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org> * @@ -25,8 +25,6 @@ #include <machine/intr.h> #include <arm/softintr.h> -extern volatile int softint_pending; - #define SI_TO_IRQBIT(si) (1U<<(si)) void sxiintc_setipl(int); void sxiintc_splx(int); |