From 2733d26597e1471db316fb6b7f2f9a12eca27a8e Mon Sep 17 00:00:00 2001 From: jsg Date: Mon, 29 Apr 2024 12:24:46 +0000 Subject: [PATCH] remove prototypes for removed functions --- sys/arch/arm/include/machdep.h | 9 +-------- sys/arch/arm/include/pmap.h | 26 +------------------------- sys/arch/armv7/omap/intc.h | 5 +---- sys/arch/armv7/sunxi/sxiintc.h | 5 +---- 4 files changed, 4 insertions(+), 41 deletions(-) diff --git a/sys/arch/arm/include/machdep.h b/sys/arch/arm/include/machdep.h index d5f06623e05..c41877f6e6d 100644 --- a/sys/arch/arm/include/machdep.h +++ b/sys/arch/arm/include/machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.h,v 1.5 2016/09/24 13:43:25 kettenis Exp $ */ +/* $OpenBSD: machdep.h,v 1.6 2024/04/29 12:24:46 jsg Exp $ */ /* $NetBSD: machdep.h,v 1.7 2002/02/21 02:52:21 thorpej Exp $ */ #ifndef _ARM_MACHDEP_H_ @@ -6,7 +6,6 @@ /* misc prototypes used by the many arm machdeps */ void halt (void); -void parse_mi_bootargs (char *); void data_abort_handler (trapframe_t *); void prefetch_abort_handler (trapframe_t *); void undefinedinstruction_bounce (trapframe_t *); @@ -18,10 +17,4 @@ void dumpsys (void); */ u_int initarm (void *, void *, void *, paddr_t); -/* from arm/arm/intr.c */ -void dosoftints (void); -void set_spl_masks (void); -#ifdef DIAGNOSTIC -void dump_spl_masks (void); -#endif #endif diff --git a/sys/arch/arm/include/pmap.h b/sys/arch/arm/include/pmap.h index fa3cb731f4b..7172e88c2b4 100644 --- a/sys/arch/arm/include/pmap.h +++ b/sys/arch/arm/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.55 2023/12/11 22:12:53 kettenis Exp $ */ +/* $OpenBSD: pmap.h,v 1.56 2024/04/29 12:24:46 jsg Exp $ */ /* $NetBSD: pmap.h,v 1.76 2003/09/06 09:10:46 rearnsha Exp $ */ /* @@ -153,18 +153,6 @@ union pmap_cache_state { */ #define PMAP_CACHE_STATE_ALL 0xffffffffu -/* - * This structure is used by machine-dependent code to describe - * static mappings of devices, created at bootstrap time. - */ -struct pmap_devmap { - vaddr_t pd_va; /* virtual address */ - paddr_t pd_pa; /* physical address */ - psize_t pd_size; /* size of region */ - vm_prot_t pd_prot; /* protection code */ - int pd_cache; /* cache attributes */ -}; - /* * The pmap structure itself */ @@ -245,12 +233,6 @@ extern struct pmap kernel_pmap_store; #define pmap_unuse_final(p) do { /* nothing */ } while (0) #define pmap_remove_holes(vm) do { /* nothing */ } while (0) -/* - * Functions that we need to export - */ -void pmap_remove_all(pmap_t); -void pmap_uncache_page(paddr_t, vaddr_t); - #define PMAP_CHECK_COPYIN 1 #define PMAP_GROWKERNEL /* turn on pmap_growkernel interface */ @@ -258,7 +240,6 @@ void pmap_uncache_page(paddr_t, vaddr_t); /* Functions we use internally. */ void pmap_bootstrap(pd_entry_t *, vaddr_t, vaddr_t); -int pmap_fault_fixup(pmap_t, vaddr_t, vm_prot_t, int); int pmap_get_pde_pte(pmap_t, vaddr_t, pd_entry_t **, pt_entry_t **); int pmap_get_pde(pmap_t, vaddr_t, pd_entry_t **); void pmap_set_pcb_pagedir(pmap_t, struct pcb *); @@ -270,16 +251,11 @@ void vector_page_setprot(int); /* XXX */ void pmap_kenter_cache(vaddr_t va, paddr_t pa, vm_prot_t prot, int cacheable); -const struct pmap_devmap *pmap_devmap_find_pa(paddr_t, psize_t); -const struct pmap_devmap *pmap_devmap_find_va(vaddr_t, vsize_t); - /* Bootstrapping routines. */ void pmap_map_section(vaddr_t, vaddr_t, paddr_t, int, int); void pmap_map_entry(vaddr_t, vaddr_t, paddr_t, int, int); vsize_t pmap_map_chunk(vaddr_t, vaddr_t, paddr_t, vsize_t, int, int); void pmap_link_l2pt(vaddr_t, vaddr_t, pv_addr_t *); -void pmap_devmap_bootstrap(vaddr_t, const struct pmap_devmap *); -void pmap_devmap_register(const struct pmap_devmap *); /* * The current top of kernel VM diff --git a/sys/arch/armv7/omap/intc.h b/sys/arch/armv7/omap/intc.h index 04b9f12016a..ae87b085b07 100644 --- a/sys/arch/armv7/omap/intc.h +++ b/sys/arch/armv7/omap/intc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intc.h,v 1.4 2020/07/14 15:34:15 patrick Exp $ */ +/* $OpenBSD: intc.h,v 1.5 2024/04/29 12:24:46 jsg Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn * @@ -25,16 +25,13 @@ #include #include -extern volatile int current_spl_level; extern volatile int softint_pending; -void intc_do_pending(void); #define SI_TO_IRQBIT(si) (1U<<(si)) void intc_setipl(int new); void intc_splx(int new); int intc_splraise(int ipl); int intc_spllower(int ipl); -void intc_setsoftintr(int si); /* * An useful function for interrupt handlers. diff --git a/sys/arch/armv7/sunxi/sxiintc.h b/sys/arch/armv7/sunxi/sxiintc.h index cec533d6597..d738ccbd233 100644 --- a/sys/arch/armv7/sunxi/sxiintc.h +++ b/sys/arch/armv7/sunxi/sxiintc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sxiintc.h,v 1.2 2020/07/14 15:34:15 patrick Exp $ */ +/* $OpenBSD: sxiintc.h,v 1.3 2024/04/29 12:24:46 jsg Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn * @@ -25,16 +25,13 @@ #include #include -extern volatile int current_spl_level; extern volatile int softint_pending; -void sxiintc_do_pending(void); #define SI_TO_IRQBIT(si) (1U<<(si)) void sxiintc_setipl(int); void sxiintc_splx(int); int sxiintc_splraise(int); int sxiintc_spllower(int); -void sxiintc_setsoftintr(int); void sxiintc_irq_handler(void *); void *sxiintc_intr_establish(int, int, struct cpu_info *, -- 2.20.1