svn commit: r367983 - stable/12/sys/kern

[Konstantin Belousov]

Author: kib
Date: Tue Nov 24 13:19:31 2020
New Revision: 367983
URL: https://svnweb.freebsd.org/changeset/base/367983

Log:
  MFCr367741:
  vmem: trivial warning and style fixes.

Modified:
  stable/12/sys/kern/subr_vmem.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/kern/subr_vmem.c
==============================================================================
--- stable/12/sys/kern/subr_vmem.c	Tue Nov 24 13:17:12 2020	(r367982)
+++ stable/12/sys/kern/subr_vmem.c	Tue Nov 24 13:19:31 2020	(r367983)
@@ -512,7 +512,7 @@ bt_insseg_tail(vmem_t *vm, bt_t *bt)
 }
 
 static void
-bt_remfree(vmem_t *vm, bt_t *bt)
+bt_remfree(vmem_t *vm __unused, bt_t *bt)
 {
 
 	MPASS(bt->bt_type == BT_TYPE_FREE);
@@ -733,10 +733,9 @@ static int
 vmem_rehash(vmem_t *vm, vmem_size_t newhashsize)
 {
 	bt_t *bt;
-	int i;
 	struct vmem_hashlist *newhashlist;
 	struct vmem_hashlist *oldhashlist;
-	vmem_size_t oldhashsize;
+	vmem_size_t i, oldhashsize;
 
 	MPASS(newhashsize > 0);
 
@@ -765,9 +764,8 @@ vmem_rehash(vmem_t *vm, vmem_size_t newhashsize)
 	}
 	VMEM_UNLOCK(vm);
 
-	if (oldhashlist != vm->vm_hash0) {
+	if (oldhashlist != vm->vm_hash0)
 		free(oldhashlist, M_VMEM);
-	}
 
 	return 0;
 }
@@ -1216,7 +1214,7 @@ vmem_t *
 vmem_init(vmem_t *vm, const char *name, vmem_addr_t base, vmem_size_t size,
     vmem_size_t quantum, vmem_size_t qcache_max, int flags)
 {
-	int i;
+	vmem_size_t i;
 
 	MPASS(quantum > 0);
 	MPASS((quantum & (quantum - 1)) == 0);
@@ -1457,7 +1455,7 @@ vmem_free(vmem_t *vm, vmem_addr_t addr, vmem_size_t si
 }
 
 void
-vmem_xfree(vmem_t *vm, vmem_addr_t addr, vmem_size_t size)
+vmem_xfree(vmem_t *vm, vmem_addr_t addr, vmem_size_t size __unused)
 {
 	bt_t *bt;
 	bt_t *t;