Page MenuHomeFreeBSD

D29811.id87926.diff
No OneTemporary

D29811.id87926.diff

Index: sys/x86/xen/xen_intr.c
===================================================================
--- sys/x86/xen/xen_intr.c
+++ sys/x86/xen/xen_intr.c
@@ -57,7 +57,6 @@
#include <machine/stdarg.h>
#include <machine/xen/synch_bitops.h>
-#include <machine/xen/xen-os.h>
#include <xen/xen-os.h>
#include <xen/hvm.h>
Index: sys/xen/xen-os.h
===================================================================
--- sys/xen/xen-os.h
+++ sys/xen/xen-os.h
@@ -86,12 +86,6 @@
return (hypervisor_info.get_start_flags());
}
-#endif
-
-#include <machine/xen/xen-os.h>
-
-/* Everything below this point is not included by assembler (.S) files. */
-#ifndef __ASSEMBLY__
extern shared_info_t *HYPERVISOR_shared_info;
@@ -132,6 +126,12 @@
return (xen_domain() && (xen_get_start_flags() & SIF_INITDOMAIN) != 0);
}
+#endif
+
+#include <machine/xen/xen-os.h>
+
+/* Everything below this point is not included by assembler (.S) files. */
+#ifndef __ASSEMBLY__
/*
* Based on ofed/include/linux/bitops.h

File Metadata

Mime Type
text/plain
Expires
Sun, Dec 21, 6:16 AM (6 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27108572
Default Alt Text
D29811.id87926.diff (1010 B)

Event Timeline