From owner-svn-src-stable-12@freebsd.org Tue Nov 24 13:19:31 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C8A324A6043; Tue, 24 Nov 2020 13:19:31 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CgPkW5Klrz4jkZ; Tue, 24 Nov 2020 13:19:31 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A9B331F3CD; Tue, 24 Nov 2020 13:19:31 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AODJVVB048362; Tue, 24 Nov 2020 13:19:31 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AODJV6A048361; Tue, 24 Nov 2020 13:19:31 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202011241319.0AODJV6A048361@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Tue, 24 Nov 2020 13:19:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r367983 - stable/12/sys/kern X-SVN-Group: stable-12 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: stable/12/sys/kern X-SVN-Commit-Revision: 367983 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Nov 2020 13:19:31 -0000 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;