From owner-dev-commits-src-main@freebsd.org Mon Mar 15 13:20:28 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 F245B57BC56; Mon, 15 Mar 2021 13:20:28 +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 4DzcVN6c1Gz4p9w; Mon, 15 Mar 2021 13:20:28 +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 D566D11235; Mon, 15 Mar 2021 13:20:28 +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 12FDKSHN021943; Mon, 15 Mar 2021 13:20:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12FDKS9b021942; Mon, 15 Mar 2021 13:20:28 GMT (envelope-from git) Date: Mon, 15 Mar 2021 13:20:28 GMT Message-Id: <202103151320.12FDKS9b021942@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: ff5272ca7149 - main - xen/xenusb: always include xen/xen-os.h rather than machine/xen/xen-os.h 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: ff5272ca714906c99df5502781d261c688f003ac 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:29 -0000 The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=ff5272ca714906c99df5502781d261c688f003ac commit ff5272ca714906c99df5502781d261c688f003ac Author: Julien Grall AuthorDate: 2021-03-15 11:15:47 +0000 Commit: Roger Pau Monné CommitDate: 2021-03-15 13:20:21 +0000 xen/xenusb: always include xen/xen-os.h rather than machine/xen/xen-os.h Fix compilation since machine/xen/xen-os.h is requiring definition existing in xen/xen-os.h. In general machine/xen/xen-os.h should never be included Submitted by: Elliott Mitchell Reviewed by: royger Differential revision: https://reviews.freebsd.org/D29043 --- sys/xen/xenbus/xenbusb.c | 2 +- sys/xen/xenbus/xenbusb_back.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/xen/xenbus/xenbusb.c b/sys/xen/xenbus/xenbusb.c index 3e49dfd9424c..74e095f6cda2 100644 --- a/sys/xen/xenbus/xenbusb.c +++ b/sys/xen/xenbus/xenbusb.c @@ -67,9 +67,9 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include +#include #include #include #include diff --git a/sys/xen/xenbus/xenbusb_back.c b/sys/xen/xenbus/xenbusb_back.c index 9beb1f6cdae1..e81d326e7a26 100644 --- a/sys/xen/xenbus/xenbusb_back.c +++ b/sys/xen/xenbus/xenbusb_back.c @@ -51,9 +51,9 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include +#include #include #include #include