xen: include compat/platform.h from hypercall.h
authorJuergen Gross <jgross@suse.com>
Mon, 11 Jul 2022 09:59:16 +0000 (11:59 +0200)
committerJan Beulich <jbeulich@suse.com>
Mon, 11 Jul 2022 09:59:16 +0000 (11:59 +0200)
The definition of compat_platform_op_t is in compat/platform.h
already, so include that file from hypercall.h instead of repeating
the typedef.

This allows to remove the related include statement from
arch/x86/x86_64/platform_hypercall.c.

Signed-off-by: Juergen Gross <jgross@suse.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
xen/arch/x86/x86_64/platform_hypercall.c
xen/include/xen/hypercall.h

index 966fd27b5f2226f24dfee236daffa0d704067a00..5bf6b958d242bbb82b172ff0d53ffd117ac1ecbc 100644 (file)
@@ -5,7 +5,6 @@
 EMIT_FILE;
 
 #include <xen/lib.h>
-#include <compat/platform.h>
 #include <xen/hypercall.h>
 
 #define xen_platform_op     compat_platform_op
index a032ba2b4a8ac512a739ac83ee16f40b23baa136..ca8ee22717306225fce21cab818a64144903859a 100644 (file)
@@ -15,6 +15,9 @@
 #include <public/version.h>
 #include <public/pmu.h>
 #include <public/hvm/dm_op.h>
+#ifdef CONFIG_COMPAT
+#include <compat/platform.h>
+#endif
 #include <asm/hypercall.h>
 #include <xsm/xsm.h>
 
@@ -206,7 +209,6 @@ extern int cf_check compat_multicall(
 
 int compat_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg);
 
-typedef struct compat_platform_op compat_platform_op_t;
 DEFINE_XEN_GUEST_HANDLE(compat_platform_op_t);
 int compat_platform_op(XEN_GUEST_HANDLE_PARAM(compat_platform_op_t) u_xenpf_op);