From: Mike Larkin <mlarkin@nested.page>
Subject: Re: remove uvm_addr_align()/uvm_addr_align_back()
To: tech@openbsd.org
Date: Wed, 3 Jul 2024 09:21:15 -0700

On Tue, Jul 02, 2024 at 09:26:18PM +1000, Jonathan Gray wrote:
> uvm_addr_align() and uvm_addr_align_back() are unused, remove them
>
> not to be confused with uvm_addr_align_forward()/uvm_addr_align_backward()
> which remain in uvm_addr.c
>

ok mlarkin

> diff --git sys/uvm/uvm_addr.c sys/uvm/uvm_addr.c
> index 904218034eb..cd414304cc0 100644
> --- sys/uvm/uvm_addr.c
> +++ sys/uvm/uvm_addr.c
> @@ -290,30 +290,6 @@ uvm_addr_destroy(struct uvm_addr_state *uaddr)
>  		(*uaddr->uaddr_functions->uaddr_destroy)(uaddr);
>  }
>
> -/*
> - * Move address forward to satisfy align, offset.
> - */
> -vaddr_t
> -uvm_addr_align(vaddr_t addr, vaddr_t align, vaddr_t offset)
> -{
> -	vaddr_t result = (addr & ~(align - 1)) + offset;
> -	if (result < addr)
> -		result += align;
> -	return result;
> -}
> -
> -/*
> - * Move address backwards to satisfy align, offset.
> - */
> -vaddr_t
> -uvm_addr_align_back(vaddr_t addr, vaddr_t align, vaddr_t offset)
> -{
> -	vaddr_t result = (addr & ~(align - 1)) + offset;
> -	if (result > addr)
> -		result -= align;
> -	return result;
> -}
> -
>  /*
>   * Directional first fit.
>   *
> diff --git sys/uvm/uvm_addr.h sys/uvm/uvm_addr.h
> index f16126da847..2c846b96a0a 100644
> --- sys/uvm/uvm_addr.h
> +++ sys/uvm/uvm_addr.h
> @@ -75,8 +75,6 @@ struct uvm_addr_functions {
>
>  void			 uvm_addr_init(void);
>  void			 uvm_addr_destroy(struct uvm_addr_state *);
> -vaddr_t			 uvm_addr_align(vaddr_t, vaddr_t, vaddr_t);
> -vaddr_t			 uvm_addr_align_back(vaddr_t, vaddr_t, vaddr_t);
>  int			 uvm_addr_linsearch(struct vm_map *,
>  			    struct uvm_addr_state *, struct vm_map_entry **,
>  			    vaddr_t *addr_out, vaddr_t, vsize_t,
>