git: ff5272ca7149 - main - xen/xenusb: always include xen/xen-os.h rather than machine/xen/xen-os.h

[Roger Pau Monné]

The branch main has been updated by royger:

URL: https://cgit.FreeBSD.org/src/commit/?id=ff5272ca714906c99df5502781d261c688f003ac

commit ff5272ca714906c99df5502781d261c688f003ac
Author:     Julien Grall <julien at xen.org>
AuthorDate: 2021-03-15 11:15:47 +0000
Commit:     Roger Pau Monné <royger at FreeBSD.org>
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 <ehem+freebsd at m5p.com>
    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 <sys/sx.h>
 #include <sys/taskqueue.h>
 
-#include <machine/xen/xen-os.h>
 #include <machine/stdarg.h>
 
+#include <xen/xen-os.h>
 #include <xen/gnttab.h>
 #include <xen/xenstore/xenstorevar.h>
 #include <xen/xenbus/xenbusb.h>
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 <sys/sx.h>
 #include <sys/taskqueue.h>
 
-#include <machine/xen/xen-os.h>
 #include <machine/stdarg.h>
 
+#include <xen/xen-os.h>
 #include <xen/gnttab.h>
 #include <xen/xenbus/xenbusvar.h>
 #include <xen/xenbus/xenbusb.h>