diff --git sys/arch/arm/arm/fiq.c sys/arch/arm/arm/fiq.c
deleted file mode 100644
index 7201ee5607e..00000000000
--- sys/arch/arm/arm/fiq.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/*	$OpenBSD: fiq.c,v 1.7 2016/01/31 00:14:50 jsg Exp $	*/
-/*	$NetBSD: fiq.c,v 1.5 2002/04/03 23:33:27 thorpej Exp $	*/
-
-/*
- * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Jason R. Thorpe for Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed for the NetBSD Project by
- *	Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-
-#include <arm/cpufunc.h>
-#include <arm/fiq.h>
-
-TAILQ_HEAD(, fiqhandler) fiqhandler_stack =
-    TAILQ_HEAD_INITIALIZER(fiqhandler_stack);
-
-extern char fiqvector[];
-extern char fiq_nullhandler[], fiq_nullhandler_end[];
-
-#define	IRQ_BIT		PSR_I
-#define	FIQ_BIT		PSR_F
-
-/*
- * fiq_installhandler:
- *
- *	Actually install the FIQ handler down at the FIQ vector.
- *
- *	Note: If the FIQ is invoked via an extra layer of
- *	indirection, the actual FIQ code store lives in the
- *	data segment, so there is no need to manipulate
- *	the vector page's protection.
- */
-static void
-fiq_installhandler(void *func, size_t size)
-{
-#if !defined(__ARM_FIQ_INDIRECT)
-	vector_page_setprot(PROT_READ | PROT_WRITE | PROT_EXEC);
-#endif
-
-	memcpy(fiqvector, func, size);
-
-#if !defined(__ARM_FIQ_INDIRECT)
-	vector_page_setprot(PROT_READ | PROT_EXEC);
-#endif
-	cpu_icache_sync_range((vaddr_t) fiqvector, size);
-}
-
-/*
- * fiq_claim:
- *
- *	Claim the FIQ vector.
- */
-int
-fiq_claim(struct fiqhandler *fh)
-{
-	struct fiqhandler *ofh;
-	u_int oldirqstate;
-	int error = 0;
-
-	if (fh->fh_size > 0x100)
-		return (EFBIG);
-
-	oldirqstate = disable_interrupts(FIQ_BIT);
-
-	if ((ofh = TAILQ_FIRST(&fiqhandler_stack)) != NULL) {
-		if ((ofh->fh_flags & FH_CANPUSH) == 0) {
-			error = EBUSY;
-			goto out;
-		}
-
-		/* Save the previous FIQ handler's registers. */
-		if (ofh->fh_regs != NULL)
-			fiq_getregs(ofh->fh_regs);
-	}
-
-	/* Set FIQ mode registers to ours. */
-	if (fh->fh_regs != NULL)
-		fiq_setregs(fh->fh_regs);
-
-	TAILQ_INSERT_HEAD(&fiqhandler_stack, fh, fh_list);
-
-	/* Now copy the actual handler into place. */
-	fiq_installhandler(fh->fh_func, fh->fh_size);
-
-	/* Make sure FIQs are enabled when we return. */
-	oldirqstate &= ~FIQ_BIT;
-
- out:
-	restore_interrupts(oldirqstate);
-	return (error);
-}
-
-/*
- * fiq_release:
- *
- *	Release the FIQ vector.
- */
-void
-fiq_release(struct fiqhandler *fh)
-{
-	u_int oldirqstate;
-	struct fiqhandler *ofh;
-
-	oldirqstate = disable_interrupts(FIQ_BIT);
-
-	/*
-	 * If we are the currently active FIQ handler, then we
-	 * need to save our registers and pop the next one back
-	 * into the vector.
-	 */
-	if (fh == TAILQ_FIRST(&fiqhandler_stack)) {
-		if (fh->fh_regs != NULL)
-			fiq_getregs(fh->fh_regs);
-		TAILQ_REMOVE(&fiqhandler_stack, fh, fh_list);
-		if ((ofh = TAILQ_FIRST(&fiqhandler_stack)) != NULL) {
-			if (ofh->fh_regs != NULL)
-				fiq_setregs(ofh->fh_regs);
-			fiq_installhandler(ofh->fh_func, ofh->fh_size);
-		}
-	} else
-		TAILQ_REMOVE(&fiqhandler_stack, fh, fh_list);
-
-	if (TAILQ_FIRST(&fiqhandler_stack) == NULL) {
-		/* Copy the NULL handler back down into the vector. */
-		fiq_installhandler(fiq_nullhandler,
-		    (size_t)(fiq_nullhandler_end - fiq_nullhandler));
-
-		/* Make sure FIQs are disabled when we return. */
-		oldirqstate |= FIQ_BIT;
-	}
-
-	restore_interrupts(oldirqstate);
-}
diff --git sys/arch/arm/arm/fiq_subr.S sys/arch/arm/arm/fiq_subr.S
deleted file mode 100644
index 0d00aa5cc93..00000000000
--- sys/arch/arm/arm/fiq_subr.S
+++ /dev/null
@@ -1,92 +0,0 @@
-/*	$OpenBSD: fiq_subr.S,v 1.5 2022/12/08 01:25:44 guenther Exp $	*/
-/*	$NetBSD: fiq_subr.S,v 1.3 2002/04/12 18:50:31 thorpej Exp $	*/
-
-/*
- * Copyright (c) 2001 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Jason R. Thorpe for Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed for the NetBSD Project by
- *	Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "assym.h"
-
-#include <arm/armreg.h>
-#include <arm/asm.h>
-#include <arm/cpuconf.h>
-
-#define	SWITCH_TO_FIQ_MODE						\
-	mrs	r2, cpsr					;	\
-	mov	r3, r2						;	\
-	bic	r2, r2, #(PSR_MODE)				;	\
-	orr	r2, r2, #(PSR_FIQ32_MODE)			;	\
-	msr	cpsr_c, r2
-
-#define	BACK_TO_SVC_MODE						\
-	msr	cpsr_c, r3
-
-/*
- * fiq_getregs:
- *
- *	Fetch the FIQ mode banked registers into the fiqhandler
- *	structure.
- */
-ENTRY(fiq_getregs)
-	SWITCH_TO_FIQ_MODE
-
-	stmia	r0, {r8-r13}
-
-	BACK_TO_SVC_MODE
-	mov	pc, lr
-
-/*
- * fiq_setregs:
- *
- *	Load the FIQ mode banked registers from the fiqhandler
- *	structure.
- */
-ENTRY(fiq_setregs)
-	SWITCH_TO_FIQ_MODE
-
-	ldmia	r0, {r8-r13}
-
-	BACK_TO_SVC_MODE
-	mov	pc, lr
-
-/*
- * fiq_nullhandler:
- *
- *	Null handler copied down to the FIQ vector when the last
- *	FIQ handler is removed.
- */
-	.global	fiq_nullhandler, fiq_nullhandler_end
-fiq_nullhandler:
-	subs	pc, lr, #4
-fiq_nullhandler_end:
diff --git sys/arch/arm/arm/genassym.cf sys/arch/arm/arm/genassym.cf
index 314714e1132..079e47940de 100644
--- sys/arch/arm/arm/genassym.cf
+++ sys/arch/arm/arm/genassym.cf
@@ -41,8 +41,6 @@ include <netinet/ip.h>
 include <machine/cpu.h>
 include <machine/cpufunc.h>
 
-include <arm/fiq.h>
-
 include <machine/frame.h>
 include <machine/vmparam.h>
 
diff --git sys/arch/arm/conf/files.arm sys/arch/arm/conf/files.arm
index 2c451014da5..be39277e4f7 100644
--- sys/arch/arm/conf/files.arm
+++ sys/arch/arm/conf/files.arm
@@ -11,10 +11,6 @@ file	arch/arm/arm/db_trace.c			ddb
 file	arch/arm/arm/db_machdep.c		ddb
 file	arch/arm/arm/disassem.c			ddb
 
-# FIQ support
-file	arch/arm/arm/fiq.c			fiq
-file	arch/arm/arm/fiq_subr.S			fiq
-
 # mainbus files
 define	mainbus {}
 device	mainbus: fdt
diff --git sys/arch/arm/include/fiq.h sys/arch/arm/include/fiq.h
deleted file mode 100644
index e246323b57f..00000000000
--- sys/arch/arm/include/fiq.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*	$OpenBSD: fiq.h,v 1.1 2004/02/01 05:09:49 drahn Exp $	*/
-/*	$NetBSD: fiq.h,v 1.1 2001/12/20 01:20:23 thorpej Exp $	*/
-
-/*
- * Copyright (c) 2001 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Jason R. Thorpe for Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed for the NetBSD Project by
- *	Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _ARM_FIQ_H_
-#define	_ARM_FIQ_H_
-
-#include <sys/queue.h>
-
-struct fiqregs {
-	u_int	fr_r8;			/* FIQ mode r8 */
-	u_int	fr_r9;			/* FIQ mode r9 */
-	u_int	fr_r10;			/* FIQ mode r10 */
-	u_int	fr_r11;			/* FIQ mode r11 */
-	u_int	fr_r12;			/* FIQ mode r12 */
-	u_int	fr_r13;			/* FIQ mode r13 */
-};
-
-struct fiqhandler {
-	TAILQ_ENTRY(fiqhandler) fh_list;/* link in the FIQ handler stack */
-	void	*fh_func;		/* FIQ handler routine */
-	size_t	fh_size;		/* size of FIQ handler */
-	int	fh_flags;		/* flags; see below */
-	struct fiqregs *fh_regs;	/* pointer to regs structure */
-};
-
-#define	FH_CANPUSH	0x01	/* can push this handler out of the way */
-
-int	fiq_claim(struct fiqhandler *);
-void	fiq_release(struct fiqhandler *);
-
-void	fiq_getregs(struct fiqregs *);
-void	fiq_setregs(struct fiqregs *);
-
-#endif /* _ARM_FIQ_H_ */