From nobody Mon Dec 25 03:58:24 2023 X-Original-To: dev-commits-src-branches@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 4Sz3zP1cKsz55HhM; Mon, 25 Dec 2023 03:58:25 +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 4Sz3zP15Msz4XMV; Mon, 25 Dec 2023 03:58:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703476705; 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=imsY2ykYJZZM2z1akt/iLs+gUunwBsKFbaBi5AOQ0fw=; b=GvYmyfZPqo0u9opCCv7nSJaV7WvmBG4OnSq3lNVIFNSAKxM13n17ysU82IIf5vnINyqAzy f5euqNFxYnwJs7wwmOSQl3IuAd6lZukFqlawV1TmHakYmQK2VBMTbXd+eNVngC1YgOvYta +WqcSyKZI+RdOp4XdQ7V3MKzHciy0OXBtFr/iGALXgNVDAdn3crcuENb/YE/5p3ZJe2Oka +VZhwiJg08xjt+H6W9OJWkUCDKkcEsOW7Jy5vTyn0nvrmoTTjBDFCHtOrKhedh+KoBIVNw w2v7pzKhepVUFlndLQrA+J5k2pPdU7mydfXu0/3yASschNBUTAuLAUV5K3h4jg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703476705; a=rsa-sha256; cv=none; b=vBT30aM9OyCkeXQYS49rs1liBWdiuew9tC9ZdbDFxVWaW3FZdXIr2ThYU9NxdP/6h8UvI0 MXbtyYtedk6YdMc+yRhy3+IaJ2WLZOpNqiaPjdeECZBcKcOPPExJrsG3lSNk3duJr2X5V5 3lTpDPZ4ia4qEYOC8cXqg0kriAiMbj/XvVr2zBwK0nOfYHvcEfBcU454cPeZEECyAx6u/i D2Bio8yzbuc9kPkUf7HUoodeehwuqZJJlcKLwguu0cy+CUNMn7nrL7cywVPLsne9TzR9EH lF5dN3FPI0JH21pIj6gvE3wGkcc+elVLRN0uc+SumQ7Qc5/YMU/tqwAPSaJJaA== 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=1703476705; 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=imsY2ykYJZZM2z1akt/iLs+gUunwBsKFbaBi5AOQ0fw=; b=DQlhE7cJ3StM8K1NxWXLkUy8sOBKJhhTTaX+lnOQBDVmW3SCVAC112pTw899qsgIh2yDjL X4R2HelsjYldlRLyE2WNiT/wWJBgyNFJWJ0G4MBUP4QuMP7xZYP6zklHn+lNROFAsVJGu0 ggcMWum+XaGH9+5mIiAwyOxLzUW9kju/y6IN6Mg4jCvIcDiF8JdhYl2b8COafOxNHjhWeQ omQl7GNJJj1/U1e8K8f9Q5PqL0Ufp/P/Yia033EQ12R5Yj2ceYtNLeMFysAtJUSs+fFmTZ UMQAgGKIxlHBnp/v4v/CGSOcjpzwx/6Otkw1+doDArZo5N/E7ZkzHOK2C/3a1g== 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 4Sz3zP08SSzw8v; Mon, 25 Dec 2023 03:58:25 +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 3BP3wOKG047825; Mon, 25 Dec 2023 03:58:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BP3wOp2047822; Mon, 25 Dec 2023 03:58:24 GMT (envelope-from git) Date: Mon, 25 Dec 2023 03:58:24 GMT Message-Id: <202312250358.3BP3wOp2047822@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: 7f5511c698bc - stable/13 - vmm.h: remove dup declaration List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: 7f5511c698bc5d1f036067df9470d2045ffcdb9e Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7f5511c698bc5d1f036067df9470d2045ffcdb9e commit 7f5511c698bc5d1f036067df9470d2045ffcdb9e Author: Konstantin Belousov AuthorDate: 2023-12-20 23:40:00 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-25 03:58:03 +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 222a8db50d11..4bd740489456 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);