From nobody Wed Dec 20 23:52:23 2023 X-Original-To: dev-commits-src-main@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 4SwVjM5m01z55TXG; Wed, 20 Dec 2023 23:52:23 +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 4SwVjM5KC6z3fY9; Wed, 20 Dec 2023 23:52:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703116343; 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=TffjocIOQYmyo5r9rCJ3H2d3lluPNAaw9+DZbyj3Sz0=; b=jodah89MvB+ZIWL3If8VdkjQwvbQtssm9ymzVDrIrr1XCjtYcv1HeX/X7M928zwRvzTx6C 7dJ0OMUrtPKU/I45zuvgSLg6AZjRwpZeqfKJH/SPUCONDBXoZ+Usp0nr+VfdMBr2uXQjSJ +QG1IeygnJp8N87TGPN1o3hOVMlxEvTrI40nsz09S7k0a8/W/5RdWIq0LUDobtFipEwijv MRF0vbc5afW9pwyYWA+PMYfWYVGq7eov5aUb6K8w1NBt9R0YiwZsIZrW3Po3X1J6t/LB2V yoPK/blHcQSmeytbBXuQdHnX0kwVIFVaGi8e3jW5+J8S+4/OeNJxI8jTAlQHtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703116343; a=rsa-sha256; cv=none; b=A5xRXq13RGxDtQ3b8w91isCcGXmakwablwWDm2Y7waBTlnMV532zs8GGywMFUcebTsoLDk cTxaOE2o5uFoN9qIgVX1dkff+7Rqx4UwQErfURT1+u1zAlysHMZAaaBPLOHTD4SPvCqgqh /yRG+7Q0WEsQ6l17EXhG0IqboaIMdI8ZBFInnJUWqAysIvmRkI/nVcNSfasqTVQPPV3mMj E8SFcXr2DwiGQjxlw8beWTuVKMwz248tUTPhvO/73JVw77E2f+nqQhf9nqAcTxoVq1jdck /hOLuEHDrwHG969CLYCdZnsxJzCkQmY03+L/Je+1y7VlV2bdDtiFDkqXPvuV1w== 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=1703116343; 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=TffjocIOQYmyo5r9rCJ3H2d3lluPNAaw9+DZbyj3Sz0=; b=qOF5Hq/AE7zaQYAxaeSXvA7wxe4tcSmA3+NuC+BE1t/GhCwwfvMG1ecJUpakiSTlPO1tPc 2bNJ5rMtxsw3N54ERrZGU0ouecrm1kB1mYFOIwjgxOD2rRZlDaerlite/yJ7AfBSbjRwxb scLukXLTdc8H1J7BcNhOgyRM5Q+aCgP0Py22QjCjHtNgHBKBtr//j6ulmIXmX+QACuk2YX BP4QXF7t5QoZ2TMBwIOW8r5jzktQsiJ0sL7SkCrbR6CHLN8KU+8F/xSUXkra0dnYPhQ/Zr 9edeHwdmYaYHeBJYJGSGxL2iwuND5BSjjM2Xu5TsG9PluwEMLFkZGq3nK5Clzw== 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 4SwVjM4Mmnz186s; Wed, 20 Dec 2023 23:52:23 +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 3BKNqNgb085735; Wed, 20 Dec 2023 23:52:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BKNqNhA085732; Wed, 20 Dec 2023 23:52:23 GMT (envelope-from git) Date: Wed, 20 Dec 2023 23:52:23 GMT Message-Id: <202312202352.3BKNqNhA085732@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 7c8f16318499 - main - vmm.h: remove dup declaration List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 7c8f16318499d2b05e916abd66148e5409284a9d Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7c8f16318499d2b05e916abd66148e5409284a9d commit 7c8f16318499d2b05e916abd66148e5409284a9d Author: Konstantin Belousov AuthorDate: 2023-12-20 23:40:00 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-20 23:51:47 +0000 vmm.h: remove dup declaration Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D43139 --- 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 abc7571187fa..273a1a46ba04 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);