From 28d09237077354eff565f9f3ef991865a249ce6c Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Wed, 22 May 2024 05:51:49 +0000
Subject: [PATCH] remove prototypes with no matching function and externs with
 no var

---
 sys/arch/amd64/include/i82093var.h       |  7 +------
 sys/arch/amd64/include/isa_machdep.h     | 11 +----------
 sys/arch/amd64/include/rbus_machdep.h    |  4 +---
 sys/arch/arm64/arm64/acpi_machdep.c      |  3 +--
 sys/arch/arm64/arm64/db_interface.c      |  8 +-------
 sys/arch/arm64/include/db_machdep.h      |  4 +---
 sys/arch/armv7/omap/ommmc.c              |  4 +---
 sys/arch/i386/i386/ipifuncs.c            |  6 +-----
 sys/arch/i386/include/gdt.h              |  3 +--
 sys/arch/i386/include/i82093var.h        |  4 +---
 sys/arch/i386/include/rbus_machdep.h     |  4 +---
 sys/arch/macppc/dev/i2s.c                |  3 +--
 sys/arch/macppc/dev/if_mc.c              |  3 +--
 sys/arch/macppc/include/autoconf.h       |  5 +----
 sys/arch/macppc/include/bus.h            |  4 +---
 sys/arch/macppc/include/z8530var.h       |  3 +--
 sys/arch/powerpc/ddb/db_disasm.c         |  4 +---
 sys/arch/powerpc/powerpc/pmap.c          |  4 +---
 sys/arch/powerpc64/include/pci_machdep.h |  3 +--
 sys/arch/powerpc64/powerpc64/db_disasm.c |  4 +---
 sys/arch/riscv64/dev/riscv_cpu_intc.h    |  4 +---
 sys/arch/riscv64/include/pci_machdep.h   |  3 +--
 sys/arch/sparc64/dev/cons.h              |  7 +------
 sys/arch/sparc64/sparc64/machdep.c       |  3 +--
 24 files changed, 24 insertions(+), 84 deletions(-)

diff --git a/sys/arch/amd64/include/i82093var.h b/sys/arch/amd64/include/i82093var.h
index 9877422de42..6d5c168618b 100644
--- a/sys/arch/amd64/include/i82093var.h
+++ b/sys/arch/amd64/include/i82093var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82093var.h,v 1.5 2016/05/04 14:30:00 kettenis Exp $	*/
+/*	$OpenBSD: i82093var.h,v 1.6 2024/05/22 05:51:49 jsg Exp $	*/
 /* $NetBSD: i82093var.h,v 1.1 2003/02/26 21:26:10 fvdl Exp $ */
 
 /*-
@@ -81,16 +81,11 @@ struct ioapic_softc {
 #define APIC_IRQ_ISLEGACY(x) (!((x) & APIC_INT_VIA_APIC))
 #define APIC_IRQ_LEGACY_IRQ(x) ((x) & 0xff)
 
-void *apic_intr_establish(int, int, int, int (*)(void *), void *); 
-void apic_intr_disestablish(void *);
-
 void ioapic_print_redir(struct ioapic_softc *, char *, int);
-void ioapic_format_redir(char *, char *, int, u_int32_t, u_int32_t);
 struct ioapic_softc *ioapic_find(int);
 struct ioapic_softc *ioapic_find_bybase(int);
 
 void ioapic_enable(void);
-void lapic_vectorset(void); /* XXX */
 
 extern int ioapic_bsp_id;
 extern int nioapics;
diff --git a/sys/arch/amd64/include/isa_machdep.h b/sys/arch/amd64/include/isa_machdep.h
index 43d6e584878..75810b4bf6b 100644
--- a/sys/arch/amd64/include/isa_machdep.h
+++ b/sys/arch/amd64/include/isa_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isa_machdep.h,v 1.10 2024/05/13 00:16:09 jsg Exp $	*/
+/*	$OpenBSD: isa_machdep.h,v 1.11 2024/05/22 05:51:49 jsg Exp $	*/
 /*	$NetBSD: isa_machdep.h,v 1.2 2003/05/09 23:51:28 fvdl Exp $	*/
 
 /*-
@@ -107,18 +107,9 @@ int	isa_intr_alloc(isa_chipset_tag_t, int, int, int *);
 void	*isa_intr_establish(isa_chipset_tag_t ic, int irq, int type,
 	    int level, int (*ih_fun)(void *), void *ih_arg, char *);
 void	isa_intr_disestablish(isa_chipset_tag_t ic, void *handler);
-int	isa_mem_alloc(bus_space_tag_t, bus_size_t, bus_size_t,
-	    bus_addr_t, int, bus_addr_t *, bus_space_handle_t *);
-void	isa_mem_free(bus_space_tag_t, bus_space_handle_t, bus_size_t);
 
 int isa_intr_check(isa_chipset_tag_t, int, int);
 
-/*
- * for ACPI code
- */
-
-void	isa_reinit_irq(void);
-
 /*
  * ALL OF THE FOLLOWING ARE MACHINE-DEPENDENT, AND SHOULD NOT BE USED
  * BY PORTABLE CODE.
diff --git a/sys/arch/amd64/include/rbus_machdep.h b/sys/arch/amd64/include/rbus_machdep.h
index 7e5dc1e58f7..7986f50d83c 100644
--- a/sys/arch/amd64/include/rbus_machdep.h
+++ b/sys/arch/amd64/include/rbus_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rbus_machdep.h,v 1.7 2011/03/23 16:54:34 pirofti Exp $	*/
+/*	$OpenBSD: rbus_machdep.h,v 1.8 2024/05/22 05:51:49 jsg Exp $	*/
 /*	$NetBSD: rbus_machdep.h,v 1.2 1999/10/15 06:43:05 haya Exp $	*/
 
 /*
@@ -42,8 +42,6 @@ rbus_tag_t	rbus_pccbb_parent_io(struct device *,
 rbus_tag_t	rbus_pccbb_parent_mem(struct device *,
 		    struct pci_attach_args *);
 
-bus_addr_t	rbus_min_start_hint(void);
-
 void		pccbb_attach_hook(struct device *, struct device *,
 		    struct pci_attach_args *);
 
diff --git a/sys/arch/arm64/arm64/acpi_machdep.c b/sys/arch/arm64/arm64/acpi_machdep.c
index 425fe8c186b..5ca2a4c7582 100644
--- a/sys/arch/arm64/arm64/acpi_machdep.c
+++ b/sys/arch/arm64/arm64/acpi_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acpi_machdep.c,v 1.21 2022/11/26 17:23:15 tobhe Exp $	*/
+/*	$OpenBSD: acpi_machdep.c,v 1.22 2024/05/22 05:51:49 jsg Exp $	*/
 /*
  * Copyright (c) 2018 Mark Kettenis
  *
@@ -40,7 +40,6 @@ int	pwr_action = 1;
 
 int	acpi_fdt_match(struct device *, void *, void *);
 void	acpi_fdt_attach(struct device *, struct device *, void *);
-void	acpi_attach(struct device *, struct device *, void *);
 
 const struct cfattach acpi_fdt_ca = {
 	sizeof(struct acpi_softc), acpi_fdt_match, acpi_fdt_attach
diff --git a/sys/arch/arm64/arm64/db_interface.c b/sys/arch/arm64/arm64/db_interface.c
index a7ed1e1db83..4ca0499efb7 100644
--- a/sys/arch/arm64/arm64/db_interface.c
+++ b/sys/arch/arm64/arm64/db_interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_interface.c,v 1.15 2024/02/23 18:19:03 cheloha Exp $	*/
+/*	$OpenBSD: db_interface.c,v 1.16 2024/05/22 05:51:49 jsg Exp $	*/
 /*	$NetBSD: db_interface.c,v 1.34 2003/10/26 23:11:15 chris Exp $	*/
 
 /*
@@ -56,12 +56,6 @@
 #include <ddb/db_run.h>
 #include <ddb/db_variables.h>
 
-
-int db_access_und_sp (struct db_variable *, db_expr_t *, int);
-int db_access_abt_sp (struct db_variable *, db_expr_t *, int);
-int db_access_irq_sp (struct db_variable *, db_expr_t *, int);
-u_int db_fetch_reg (int, db_regs_t *);
-
 int db_trapper (vaddr_t, u_int, trapframe_t *, int);
 
 struct db_variable db_regs[] = {
diff --git a/sys/arch/arm64/include/db_machdep.h b/sys/arch/arm64/include/db_machdep.h
index 6a3e4be0b98..8b47d629c61 100644
--- a/sys/arch/arm64/include/db_machdep.h
+++ b/sys/arch/arm64/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.5 2021/08/30 08:11:12 jasper Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.6 2024/05/22 05:51:49 jsg Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.5 2001/11/22 18:00:00 thorpej Exp $	*/
 
 /*
@@ -87,8 +87,6 @@ void db_machine_init (void);
 #define branch_taken(ins, pc, fun, regs) \
 	db_branch_taken((ins), (pc), (regs))
 
-void db_show_frame_cmd(db_expr_t, int, db_expr_t, char *);
-
 #define DDB_STATE_NOT_RUNNING	0  
 #define DDB_STATE_RUNNING	1
 #define DDB_STATE_EXITING	2
diff --git a/sys/arch/armv7/omap/ommmc.c b/sys/arch/armv7/omap/ommmc.c
index 381064c0ee6..ed03d5b5600 100644
--- a/sys/arch/armv7/omap/ommmc.c
+++ b/sys/arch/armv7/omap/ommmc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ommmc.c,v 1.40 2021/10/24 17:52:27 mpi Exp $	*/
+/*	$OpenBSD: ommmc.c,v 1.41 2024/05/22 05:51:49 jsg Exp $	*/
 
 /*
  * Copyright (c) 2009 Dale Rahn <drahn@openbsd.org>
@@ -206,8 +206,6 @@ struct ommmc_softc {
 
 
 /* Host controller functions called by the attachment driver. */
-int	ommmc_host_found(struct ommmc_softc *, bus_space_tag_t,
-	    bus_space_handle_t, bus_size_t, int);
 void	ommmc_power(int, void *);
 void	ommmc_shutdown(void *);
 int	ommmc_intr(void *);
diff --git a/sys/arch/i386/i386/ipifuncs.c b/sys/arch/i386/i386/ipifuncs.c
index 81a03ae5fd7..22cc4915341 100644
--- a/sys/arch/i386/i386/ipifuncs.c
+++ b/sys/arch/i386/i386/ipifuncs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipifuncs.c,v 1.35 2023/10/30 12:50:59 mvs Exp $	*/
+/*	$OpenBSD: ipifuncs.c,v 1.36 2024/05/22 05:51:49 jsg Exp $	*/
 /* $NetBSD: ipifuncs.c,v 1.1.2.3 2000/06/26 02:04:06 sommerfeld Exp $ */
 
 /*-
@@ -73,11 +73,7 @@ void (*ipifunc[I386_NIPI])(struct cpu_info *) =
 	i386_ipi_flush_fpu,
 	i386_ipi_synch_fpu,
 	i386_ipi_reload_mtrr,
-#if 0
-	gdt_reload_cpu,
-#else
 	NULL,
-#endif
 #ifdef DDB
 	i386_ipi_db,
 #else
diff --git a/sys/arch/i386/include/gdt.h b/sys/arch/i386/include/gdt.h
index 5ecc4565d29..97a4fd02e87 100644
--- a/sys/arch/i386/include/gdt.h
+++ b/sys/arch/i386/include/gdt.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gdt.h,v 1.17 2018/04/11 15:44:08 bluhm Exp $	*/
+/*	$OpenBSD: gdt.h,v 1.18 2024/05/22 05:51:49 jsg Exp $	*/
 /*	$NetBSD: gdt.h,v 1.7.10.6 2002/08/19 01:22:36 sommerfeld Exp $	*/
 
 /*-
@@ -39,6 +39,5 @@ struct pmap;
 void gdt_alloc_cpu(struct cpu_info *);
 void gdt_init(void);
 void gdt_init_cpu(struct cpu_info *);
-void gdt_reload_cpu(/* XXX struct cpu_info * */ void);
 void setgdt(int, void *, size_t, int, int, int, int);
 #endif
diff --git a/sys/arch/i386/include/i82093var.h b/sys/arch/i386/include/i82093var.h
index 5439da32dc6..fd86a6e4bc2 100644
--- a/sys/arch/i386/include/i82093var.h
+++ b/sys/arch/i386/include/i82093var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82093var.h,v 1.11 2011/05/21 15:14:57 kettenis Exp $	*/
+/*	$OpenBSD: i82093var.h,v 1.12 2024/05/22 05:51:49 jsg Exp $	*/
 /* $NetBSD: i82093var.h,v 1.1 2003/02/26 21:26:10 fvdl Exp $ */
 
 /*-
@@ -86,12 +86,10 @@ void   *apic_intr_establish(int, int, int, int (*)(void *), void *,
 void	apic_intr_disestablish(void *);
 
 void	ioapic_print_redir(struct ioapic_softc *, char *, int);
-void	ioapic_format_redir(char *, char *, int, u_int32_t, u_int32_t);
 struct ioapic_softc *ioapic_find(int);
 struct ioapic_softc *ioapic_find_bybase(int);
 
 void	ioapic_enable(void);
-void	lapic_vectorset(void); /* XXX */
 
 extern int ioapic_bsp_id;
 extern int nioapics;
diff --git a/sys/arch/i386/include/rbus_machdep.h b/sys/arch/i386/include/rbus_machdep.h
index b8c1d54e776..c3b5aa81f02 100644
--- a/sys/arch/i386/include/rbus_machdep.h
+++ b/sys/arch/i386/include/rbus_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rbus_machdep.h,v 1.9 2011/03/23 16:54:35 pirofti Exp $	*/
+/*	$OpenBSD: rbus_machdep.h,v 1.10 2024/05/22 05:51:49 jsg Exp $	*/
 /*	$NetBSD: rbus_machdep.h,v 1.2 1999/10/15 06:43:05 haya Exp $	*/
 
 /*
@@ -42,8 +42,6 @@ rbus_tag_t	rbus_pccbb_parent_io(struct device *,
 rbus_tag_t	rbus_pccbb_parent_mem(struct device *,
 		    struct pci_attach_args *);
 
-bus_addr_t	rbus_min_start_hint(void);
-
 void		pccbb_attach_hook(struct device *, struct device *,
 		    struct pci_attach_args *);
 
diff --git a/sys/arch/macppc/dev/i2s.c b/sys/arch/macppc/dev/i2s.c
index 8501ff7f46f..0cf41229552 100644
--- a/sys/arch/macppc/dev/i2s.c
+++ b/sys/arch/macppc/dev/i2s.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i2s.c,v 1.38 2024/04/14 03:26:25 jsg Exp $	*/
+/*	$OpenBSD: i2s.c,v 1.39 2024/05/22 05:51:49 jsg Exp $	*/
 /*	$NetBSD: i2s.c,v 1.1 2003/12/27 02:19:34 grant Exp $	*/
 
 /*-
@@ -55,7 +55,6 @@
 void	i2s_mute(u_int, int);
 int	i2s_cint(void *);
 u_int	i2s_gpio_offset(struct i2s_softc *, char *, int *);
-void	i2s_init(struct i2s_softc *, int);
 
 int	i2s_intr(void *);
 int	i2s_iintr(void *);
diff --git a/sys/arch/macppc/dev/if_mc.c b/sys/arch/macppc/dev/if_mc.c
index a4175ee8739..bfa22d85239 100644
--- a/sys/arch/macppc/dev/if_mc.c
+++ b/sys/arch/macppc/dev/if_mc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_mc.c,v 1.33 2022/04/06 18:59:26 naddy Exp $	*/
+/*	$OpenBSD: if_mc.c,v 1.34 2024/05/22 05:51:49 jsg Exp $	*/
 /*	$NetBSD: if_mc.c,v 1.9.16.1 2006/06/21 14:53:13 yamt Exp $	*/
 
 /*-
@@ -307,7 +307,6 @@ struct cfdriver mc_cd = {
 };
 
 void	mc_init(struct mc_softc *sc);
-void	mc_put(struct mc_softc *sc, u_int len);
 int	mc_dmaintr(void *arg);
 void	mc_reset_rxdma(struct mc_softc *sc);
 void	mc_reset_txdma(struct mc_softc *sc);
diff --git a/sys/arch/macppc/include/autoconf.h b/sys/arch/macppc/include/autoconf.h
index a0266e137c9..b4adafae28f 100644
--- a/sys/arch/macppc/include/autoconf.h
+++ b/sys/arch/macppc/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.h,v 1.12 2015/04/02 11:12:24 mpi Exp $ */
+/*	$OpenBSD: autoconf.h,v 1.13 2024/05/22 05:51:49 jsg Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -47,10 +47,7 @@ struct confargs {
 
 };
 
-void	set_clockintr(void (*)(struct clockframe *));
-void	set_iointr(void (*)(void *, int));
 int	badaddr(void *, u_int32_t);
-void calc_delayconst(void);
 
 typedef int (time_read_t)(time_t *sec);
 typedef int (time_write_t)(time_t sec);
diff --git a/sys/arch/macppc/include/bus.h b/sys/arch/macppc/include/bus.h
index c212e77ae33..2c002198629 100644
--- a/sys/arch/macppc/include/bus.h
+++ b/sys/arch/macppc/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.26 2017/05/08 00:27:45 dlg Exp $	*/
+/*	$OpenBSD: bus.h,v 1.27 2024/05/22 05:51:49 jsg Exp $	*/
 
 /*
  * Copyright (c) 1997 Per Fogelstrom.  All rights reserved.
@@ -59,8 +59,6 @@ struct ppc_bus_space {
 };
 #define POWERPC_BUS_TAG_BASE(x)  ((x)->bus_base)
 
-extern struct ppc_bus_space ppc_isa_io, ppc_isa_mem;
-
 /*
  * Access methods for bus resources
  */
diff --git a/sys/arch/macppc/include/z8530var.h b/sys/arch/macppc/include/z8530var.h
index ac02b7cd53c..5ebe7e66cb0 100644
--- a/sys/arch/macppc/include/z8530var.h
+++ b/sys/arch/macppc/include/z8530var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: z8530var.h,v 1.10 2021/03/11 11:16:58 jsg Exp $	*/
+/*	$OpenBSD: z8530var.h,v 1.11 2024/05/22 05:51:49 jsg Exp $	*/
 /*	$NetBSD: z8530var.h,v 1.5 2002/03/17 19:40:45 atatat Exp $	*/
 
 /*
@@ -145,7 +145,6 @@ struct zschan {
 	volatile u_char	zc_data;	/* data */
 	u_char		zc_xxx1[15];
 };
-void	zs_kgdb_init (void);
 
 #ifndef ZSCCF_CHANNEL
 #define ZSCCF_CHANNEL 0
diff --git a/sys/arch/powerpc/ddb/db_disasm.c b/sys/arch/powerpc/ddb/db_disasm.c
index 2051e76a114..8ab67510088 100644
--- a/sys/arch/powerpc/ddb/db_disasm.c
+++ b/sys/arch/powerpc/ddb/db_disasm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_disasm.c,v 1.20 2020/06/06 22:53:04 kettenis Exp $	*/
+/*	$OpenBSD: db_disasm.c,v 1.21 2024/05/22 05:51:49 jsg Exp $	*/
 /*
  * Copyright (c) 1996, 2001, 2003 Dale Rahn. All rights reserved.
  *
@@ -474,8 +474,6 @@ extract_field(u_int32_t value, u_int32_t base, u_int32_t width)
 	return ((value >> (31 - base)) & mask);
 }
 
-const struct opcode * search_op(const struct opcode *);
-
 char *db_BOBI_cond[] = {
 	"ge",
 	"le",
diff --git a/sys/arch/powerpc/powerpc/pmap.c b/sys/arch/powerpc/powerpc/pmap.c
index fa773114fad..4755a79888f 100644
--- a/sys/arch/powerpc/powerpc/pmap.c
+++ b/sys/arch/powerpc/powerpc/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.183 2024/04/03 19:30:59 gkoehler Exp $ */
+/*	$OpenBSD: pmap.c,v 1.184 2024/05/22 05:51:49 jsg Exp $ */
 
 /*
  * Copyright (c) 2015 Martin Pieuchot
@@ -155,8 +155,6 @@ void pmap_fill_pte32(pmap_t, vaddr_t, paddr_t, struct pte_desc *, vm_prot_t,
 
 void pmap_syncicache_user_virt(pmap_t pm, vaddr_t va);
 
-void _pmap_kenter_pa(vaddr_t va, paddr_t pa, vm_prot_t prot, int flags,
-    int cache);
 void pmap_remove_pted(pmap_t, struct pte_desc *);
 
 /* setup/initialization functions */
diff --git a/sys/arch/powerpc64/include/pci_machdep.h b/sys/arch/powerpc64/include/pci_machdep.h
index 7e3201c6c1b..265c8ae9930 100644
--- a/sys/arch/powerpc64/include/pci_machdep.h
+++ b/sys/arch/powerpc64/include/pci_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_machdep.h,v 1.5 2021/06/09 19:46:33 kettenis Exp $ */
+/*	$OpenBSD: pci_machdep.h,v 1.6 2024/05/22 05:51:49 jsg Exp $ */
 
 /*
  * Copyright (c) 2003-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -119,7 +119,6 @@ struct ppc64_pci_chipset {
 #define	pci_dev_postattach(a, b)
 
 void	pci_mcfg_init(bus_space_tag_t, bus_addr_t, int, int, int);
-pci_chipset_tag_t pci_lookup_segment(int);
 
 void	pci_msi_enable(pci_chipset_tag_t, pcitag_t, bus_addr_t, uint32_t);
 void	pci_msix_enable(pci_chipset_tag_t, pcitag_t, bus_space_tag_t,
diff --git a/sys/arch/powerpc64/powerpc64/db_disasm.c b/sys/arch/powerpc64/powerpc64/db_disasm.c
index 73133d4d99e..03295bd2ba5 100644
--- a/sys/arch/powerpc64/powerpc64/db_disasm.c
+++ b/sys/arch/powerpc64/powerpc64/db_disasm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_disasm.c,v 1.3 2020/06/06 22:52:35 kettenis Exp $	*/
+/*	$OpenBSD: db_disasm.c,v 1.4 2024/05/22 05:51:49 jsg Exp $	*/
 /*
  * Copyright (c) 1996, 2001, 2003 Dale Rahn. All rights reserved.
  *
@@ -474,8 +474,6 @@ extract_field(u_int32_t value, u_int32_t base, u_int32_t width)
 	return ((value >> (31 - base)) & mask);
 }
 
-const struct opcode * search_op(const struct opcode *);
-
 char *db_BOBI_cond[] = {
 	"ge",
 	"le",
diff --git a/sys/arch/riscv64/dev/riscv_cpu_intc.h b/sys/arch/riscv64/dev/riscv_cpu_intc.h
index 34937b040e3..c00b23b1b1f 100644
--- a/sys/arch/riscv64/dev/riscv_cpu_intc.h
+++ b/sys/arch/riscv64/dev/riscv_cpu_intc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: riscv_cpu_intc.h,v 1.3 2021/05/12 01:20:52 jsg Exp $	*/
+/*	$OpenBSD: riscv_cpu_intc.h,v 1.4 2024/05/22 05:51:49 jsg Exp $	*/
 
 /*
  * Copyright (c) 2020 Mars Li <mengshi.li.mars@gmai..com>
@@ -21,8 +21,6 @@
 
 void	*riscv_intc_intr_establish(int, int, int (*func)(void *),
 		void *, char *);
-void	*riscv_intc_intr_establish_fdt(void *, int *, int, int (*)(void *),
-		void *, char *);
 void	riscv_intc_intr_disestablish(void *cookie);
 
 #endif /* _RISCV_CPU_INTC_H_ */
diff --git a/sys/arch/riscv64/include/pci_machdep.h b/sys/arch/riscv64/include/pci_machdep.h
index 066d78668f5..ac6e03d53d8 100644
--- a/sys/arch/riscv64/include/pci_machdep.h
+++ b/sys/arch/riscv64/include/pci_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_machdep.h,v 1.4 2024/02/03 10:37:26 kettenis Exp $ */
+/*	$OpenBSD: pci_machdep.h,v 1.5 2024/05/22 05:51:49 jsg Exp $ */
 
 /*
  * Copyright (c) 2003-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -123,7 +123,6 @@ struct machine_pci_chipset {
 #define	pci_dev_postattach(a, b)
 
 void	pci_mcfg_init(bus_space_tag_t, bus_addr_t, int, int, int);
-pci_chipset_tag_t pci_lookup_segment(int);
 
 void	pci_msi_enable(pci_chipset_tag_t, pcitag_t, bus_addr_t, uint32_t);
 void	pci_msix_enable(pci_chipset_tag_t, pcitag_t, bus_space_tag_t,
diff --git a/sys/arch/sparc64/dev/cons.h b/sys/arch/sparc64/dev/cons.h
index 8169ad1e3e9..bd61173d43d 100644
--- a/sys/arch/sparc64/dev/cons.h
+++ b/sys/arch/sparc64/dev/cons.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cons.h,v 1.5 2024/05/13 01:15:50 jsg Exp $	*/
+/*	$OpenBSD: cons.h,v 1.6 2024/05/22 05:51:49 jsg Exp $	*/
 /*	$NetBSD: cons.h,v 1.3 2000/05/19 05:26:17 eeh Exp $	*/
 
 /*-
@@ -36,10 +36,5 @@ void pcons_cnpollc(dev_t dev, int on);
 struct consdev;
 struct zs_chanstate;
 
-extern void *zs_conschan;
-
 extern int  zs_getc(void *arg);
 extern void zs_putc(void *arg, int c);
-
-struct zschan *
-zs_get_chan_addr(int zsc_unit, int channel);
diff --git a/sys/arch/sparc64/sparc64/machdep.c b/sys/arch/sparc64/sparc64/machdep.c
index 7e8b8672721..5310a0ec054 100644
--- a/sys/arch/sparc64/sparc64/machdep.c
+++ b/sys/arch/sparc64/sparc64/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.217 2024/05/14 08:26:13 jsg Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.218 2024/05/22 05:51:49 jsg Exp $	*/
 /*	$NetBSD: machdep.c,v 1.108 2001/07/24 19:30:14 eeh Exp $ */
 
 /*-
@@ -153,7 +153,6 @@ struct uvm_constraint_range  dma_constraint = { 0x0, (paddr_t)-1 };
 struct uvm_constraint_range *uvm_md_constraints[] = { NULL };
 
 int	physmem;
-extern	caddr_t msgbufaddr;
 
 int sparc_led_blink = 1;
 
-- 
2.20.1