From c0cf638136ad0f3432e8e8596ba863cfa1f5d5e9 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Mon, 18 Mar 2024 13:26:06 +0100
Subject: [PATCH] xfree86: os-support: move including machine/sysarch.h out of
 public header

The only consumer seems to be one BSD specific file, the few drivers using
the *_iopl seem to include it on their own. Thus, no need to keep it in
public headers.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1420>
(cherry picked from commit bd40e9f836c237e953895ddd44d5b11200ad4fa7)
---
 hw/xfree86/os-support/bsd/i386_video.c | 4 ++++
 hw/xfree86/os-support/xf86_OSlib.h     | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/xfree86/os-support/bsd/i386_video.c b/hw/xfree86/os-support/bsd/i386_video.c
index 7ad8286b3..635a17265 100644
--- a/hw/xfree86/os-support/bsd/i386_video.c
+++ b/hw/xfree86/os-support/bsd/i386_video.c
@@ -36,6 +36,10 @@
 #include "xf86_OSlib.h"
 #include "xf86OSpriv.h"
 
+#if defined(USE_I386_IOPL) || defined(USE_AMD64_IOPL)
+#include <machine/sysarch.h>
+#endif
+
 #if defined(__NetBSD__) && !defined(MAP_FILE)
 #define MAP_FLAGS MAP_SHARED
 #else
diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index 214dd9466..62bc431d6 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -207,10 +207,6 @@ struct pcvtid {
 #define CONSOLE_X_BELL _IOW('t',123,int[2])
 #endif
 
-#if defined(USE_I386_IOPL) || defined(USE_AMD64_IOPL)
-#include <machine/sysarch.h>
-#endif
-
 #define CLEARDTR_SUPPORT
 
 #endif                          /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */