From owner-dev-commits-src-main@freebsd.org Mon Mar 15 13:20:30 2021 Return-Path: Delivered-To: dev-commits-src-main@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 4146657BBE9; Mon, 15 Mar 2021 13:20:30 +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 4DzcVQ0K7Dz4p9y; Mon, 15 Mar 2021 13:20:30 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 F152411591; Mon, 15 Mar 2021 13:20:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12FDKTfj021964; Mon, 15 Mar 2021 13:20:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12FDKT9h021963; Mon, 15 Mar 2021 13:20:29 GMT (envelope-from git) Date: Mon, 15 Mar 2021 13:20:29 GMT Message-Id: <202103151320.12FDKT9h021963@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Roger Pau Monné Subject: git: b55c0d5f56bd - main - xen: move x86-specific xen_vector_callback_enabled to sys/x86 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b55c0d5f56bde414b2c9842c23deaa30ab17e474 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Mar 2021 13:20:30 -0000 The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=b55c0d5f56bde414b2c9842c23deaa30ab17e474 commit b55c0d5f56bde414b2c9842c23deaa30ab17e474 Author: Julien Grall AuthorDate: 2021-03-15 11:27:36 +0000 Commit: Roger Pau Monné CommitDate: 2021-03-15 13:20:21 +0000 xen: move x86-specific xen_vector_callback_enabled to sys/x86 This is x86-only and so should not be in the common area. Submitted by: Elliott Mitchell Reviewed by: royger Differential revision: https://reviews.freebsd.org/D29040 --- sys/x86/include/xen/xen-os.h | 3 +++ sys/xen/xen_intr.h | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/x86/include/xen/xen-os.h b/sys/x86/include/xen/xen-os.h index 115310520af0..86bacadc8521 100644 --- a/sys/x86/include/xen/xen-os.h +++ b/sys/x86/include/xen/xen-os.h @@ -33,6 +33,9 @@ /* Everything below this point is not included by assembler (.S) files. */ #ifndef __ASSEMBLY__ +/* If non-zero, the hypervisor has been configured to use a direct vector */ +extern int xen_vector_callback_enabled; + #endif /* !__ASSEMBLY__ */ #endif /* _MACHINE_X86_XEN_XEN_OS_H_ */ diff --git a/sys/xen/xen_intr.h b/sys/xen/xen_intr.h index 4aa4a9a8b8ea..74570267364d 100644 --- a/sys/xen/xen_intr.h +++ b/sys/xen/xen_intr.h @@ -38,9 +38,6 @@ /** Registered Xen interrupt callback handle. */ typedef void * xen_intr_handle_t; -/** If non-zero, the hypervisor has been configured to use a direct vector */ -extern int xen_vector_callback_enabled; - void xen_intr_handle_upcall(struct trapframe *trap_frame); /**