diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -2677,7 +2677,7 @@ } bool -pmap_is_valid_memattr(pmap_t pmap __unused, vm_memattr_t mode) +pmap_is_valid_memattr(vm_memattr_t mode) { return (mode >= 0 && mode < PAT_INDEX_SIZE && @@ -2693,7 +2693,7 @@ { int cache_bits, pat_flag, pat_idx; - if (!pmap_is_valid_memattr(pmap, mode)) + if (!pmap_is_valid_memattr(mode)) panic("Unknown caching mode %d\n", mode); switch (pmap->pm_type) { diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c --- a/sys/arm/arm/pmap-v6.c +++ b/sys/arm/arm/pmap-v6.c @@ -398,7 +398,7 @@ #define VM_MEMATTR_END (VM_MEMATTR_WRITE_THROUGH + 1) bool -pmap_is_valid_memattr(pmap_t pmap __unused, vm_memattr_t mode) +pmap_is_valid_memattr(vm_memattr_t mode) { return (mode >= 0 && mode < VM_MEMATTR_END); diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -9009,7 +9009,7 @@ } bool -pmap_is_valid_memattr(pmap_t pmap __unused, vm_memattr_t mode) +pmap_is_valid_memattr(vm_memattr_t mode) { return (mode >= VM_MEMATTR_DEVICE && mode <= VM_MEMATTR_WRITE_THROUGH); diff --git a/sys/dev/pci/pci_user.c b/sys/dev/pci/pci_user.c --- a/sys/dev/pci/pci_user.c +++ b/sys/dev/pci/pci_user.c @@ -865,7 +865,7 @@ if ((pbm->pbm_flags & ~(PCIIO_BAR_MMAP_FIXED | PCIIO_BAR_MMAP_EXCL | PCIIO_BAR_MMAP_RW | PCIIO_BAR_MMAP_ACTIVATE)) != 0 || pbm->pbm_memattr != (vm_memattr_t)pbm->pbm_memattr || - !pmap_is_valid_memattr(map->pmap, pbm->pbm_memattr)) + !pmap_is_valid_memattr(pbm->pbm_memattr)) return (EINVAL); /* Fetch the BAR physical base and length. */ diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -1080,7 +1080,7 @@ ***************************************************/ static bool -__CONCAT(PMTYPE, is_valid_memattr)(pmap_t pmap __unused, vm_memattr_t mode) +__CONCAT(PMTYPE, is_valid_memattr)(vm_memattr_t mode) { return (mode >= 0 && mode < PAT_INDEX_SIZE && @@ -1096,7 +1096,7 @@ { int cache_bits, pat_flag, pat_idx; - if (!pmap_is_valid_memattr(pmap, mode)) + if (!pmap_is_valid_memattr(mode)) panic("Unknown caching mode %d\n", mode); /* The PAT bit is different for PTE's and PDE's. */ diff --git a/sys/i386/i386/pmap_base.c b/sys/i386/i386/pmap_base.c --- a/sys/i386/i386/pmap_base.c +++ b/sys/i386/i386/pmap_base.c @@ -558,10 +558,10 @@ } bool -pmap_is_valid_memattr(pmap_t pmap, vm_memattr_t mode) +pmap_is_valid_memattr(vm_memattr_t mode) { - return (pmap_methods_ptr->pm_is_valid_memattr(pmap, mode)); + return (pmap_methods_ptr->pm_is_valid_memattr(mode)); } int diff --git a/sys/i386/include/pmap_base.h b/sys/i386/include/pmap_base.h --- a/sys/i386/include/pmap_base.h +++ b/sys/i386/include/pmap_base.h @@ -58,7 +58,7 @@ void *(*pm_bios16_enter)(void); void (*pm_bios16_leave)(void *handle); void (*pm_bootstrap)(vm_paddr_t firstaddr); - bool (*pm_is_valid_memattr)(pmap_t, vm_memattr_t); + bool (*pm_is_valid_memattr)(vm_memattr_t); int (*pm_cache_bits)(pmap_t, int, bool); bool (*pm_ps_enabled)(pmap_t); void (*pm_pinit0)(pmap_t); diff --git a/sys/powerpc/powerpc/pmap_dispatch.c b/sys/powerpc/powerpc/pmap_dispatch.c --- a/sys/powerpc/powerpc/pmap_dispatch.c +++ b/sys/powerpc/powerpc/pmap_dispatch.c @@ -237,7 +237,7 @@ int unmapped_buf_allowed; bool -pmap_is_valid_memattr(pmap_t pmap __unused, vm_memattr_t mode) +pmap_is_valid_memattr(vm_memattr_t mode) { switch (mode) { diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -4886,7 +4886,7 @@ } bool -pmap_is_valid_memattr(pmap_t pmap __unused, vm_memattr_t mode) +pmap_is_valid_memattr(vm_memattr_t mode) { return (mode >= VM_MEMATTR_DEVICE && mode <= VM_MEMATTR_WRITE_BACK); diff --git a/sys/vm/pmap.h b/sys/vm/pmap.h --- a/sys/vm/pmap.h +++ b/sys/vm/pmap.h @@ -141,7 +141,7 @@ bool pmap_is_modified(vm_page_t m); bool pmap_is_prefaultable(pmap_t pmap, vm_offset_t va); bool pmap_is_referenced(vm_page_t m); -bool pmap_is_valid_memattr(pmap_t, vm_memattr_t); +bool pmap_is_valid_memattr(vm_memattr_t); vm_offset_t pmap_map(vm_offset_t *, vm_paddr_t, vm_paddr_t, int); int pmap_mincore(pmap_t pmap, vm_offset_t addr, vm_paddr_t *pap); void pmap_object_init_pt(pmap_t pmap, vm_offset_t addr,