From nobody Mon Dec 25 03:57:52 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sz3ym60SGz55HSX; Mon, 25 Dec 2023 03:57:52 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sz3ym5Q8Hz4Wvk; Mon, 25 Dec 2023 03:57:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703476672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8coG04IwTxUZVvUSEfxRciQHww7xLkrsKUhzFS/SpU0=; b=Y/8ifb8jKVJQTUKW+2X+oM143tJdzXIeIxj2Qh8bWHg1xt45UTY8Dsn2S1p6bJgvZm4Di0 Ss/HVoTWozg1JtOLeDKRPYlcGlFfCt3tKhSdFsDB/4hyeXCPMfA0P1xqPV9blfO85hNgZP F+8XyTR1vVkVULQwpEMCFtlR7kvP5eoYEfou115OzVZF2qO5iRKkMBWh442pmHpBYEUUzN B/ZGXngPH8Pep+Iqkh5SnaxGYXB5rUmTXI40+8uaL2GhZszSV8L3jhTne6Z7U5UcdvsMSl eIkik10oA+6bIn0ByLSutP/khtUAdKcpOFmmLZufxRBp/EhdaOlW0uGAepYaFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703476672; a=rsa-sha256; cv=none; b=QL/kra/D1/x8+MRVeu1KPFack94b51y3nMZyJSVwhuuYmwHGfUEMVt7nfYuk6CLs+zPvFB J9HrMAqUkceMFG2pnEMRfslIZU1+P29+tuVqxaK1KCr7TuDlyhkOrAxjkMkxjH4FFuph1O 7XQaljQNXM2G2zHftF5bwVbLWf6aeooHYS4RrYx7e0GXvY2LzhETenCdC8m2qjuQrAcabt h4dL6PVXpyhEZVZpMqNnnUnksslI0xMSSRV9KOcbkgpC+hipi70YGEMTVMHDc1OA5PvKBp d2rWInPjx1CfllP/FE8FIQliSmfYb8781pfkfC2rYkHQEbbNmhM9v8Sl+EiJog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703476672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8coG04IwTxUZVvUSEfxRciQHww7xLkrsKUhzFS/SpU0=; b=Tus076vOfD+/HqmGdVtq4zDYRAToKuf408pfMNXBAcQmpHTf90ghaSbiEHFP9mAl0XoxdG 7WRl2bWvfBSaGxVJV5AtN+vovORBAmf1OlPm87BfJegsKP8NPJZfwJVzbp2IEooEy/XO7g JJ1o7fSYwvWN5RIGtkM0JlERy1VQBb6lD+zvqrhd4wRNdQ4SY5oq2BEmTHeBl/sMXaKxWZ 3sa4ZhVoYmcSq37IEofvowYA8RIrzWzljEX3GqxeKaqKlLFgVLBqabMDihOnrWsfzG9wiR sShngnjLCAbKzmbT9SU73SzpvOY6xzFVRhJwqwDnD20sf91YYgH9ZiliGHYCEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sz3ym4SFwzvSs; Mon, 25 Dec 2023 03:57:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BP3vqKv047580; Mon, 25 Dec 2023 03:57:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BP3vqtn047577; Mon, 25 Dec 2023 03:57:52 GMT (envelope-from git) Date: Mon, 25 Dec 2023 03:57:52 GMT Message-Id: <202312250357.3BP3vqtn047577@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c06a5fd3b110 - stable/14 - vmm.h: remove dup declaration List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c06a5fd3b1108d9b54724d17fac008f60e46c0d7 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c06a5fd3b1108d9b54724d17fac008f60e46c0d7 commit c06a5fd3b1108d9b54724d17fac008f60e46c0d7 Author: Konstantin Belousov AuthorDate: 2023-12-20 23:40:00 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-25 03:57:25 +0000 vmm.h: remove dup declaration (cherry picked from commit 7c8f16318499d2b05e916abd66148e5409284a9d) --- sys/amd64/include/vmm.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/amd64/include/vmm.h b/sys/amd64/include/vmm.h index 0210aeef80fd..2b18e1c97dd6 100644 --- a/sys/amd64/include/vmm.h +++ b/sys/amd64/include/vmm.h @@ -260,8 +260,6 @@ void *vm_gpa_hold(struct vcpu *vcpu, vm_paddr_t gpa, size_t len, int prot, void **cookie); void *vm_gpa_hold_global(struct vm *vm, vm_paddr_t gpa, size_t len, int prot, void **cookie); -void *vm_gpa_hold_global(struct vm *vm, vm_paddr_t gpa, size_t len, - int prot, void **cookie); void vm_gpa_release(void *cookie); bool vm_mem_allocated(struct vcpu *vcpu, vm_paddr_t gpa);