aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2014-04-05 22:43:18 +0000
committerWarner Losh <imp@FreeBSD.org>2014-04-05 22:43:18 +0000
commitb7df74ee5a5351e2c67af60b9cfdd4ee54f8fa25 (patch)
treeaf7e776018a083d55f3063306d4de59c66cd815f
parent3e5a6bd16de8fc510747abdd932a76d04173df10 (diff)
downloadsrc-b7df74ee5a5351e2c67af60b9cfdd4ee54f8fa25.tar.gz
src-b7df74ee5a5351e2c67af60b9cfdd4ee54f8fa25.zip
Make this compile with gcc.
Submitted by: royger@
Notes
Notes: svn path=/head/; revision=264178
-rw-r--r--sys/i386/xen/xen_machdep.c4
-rw-r--r--sys/x86/xen/pv.c1
-rw-r--r--sys/xen/xen-os.h1
3 files changed, 2 insertions, 4 deletions
diff --git a/sys/i386/xen/xen_machdep.c b/sys/i386/xen/xen_machdep.c
index d67406d37eb0..46409a54653c 100644
--- a/sys/i386/xen/xen_machdep.c
+++ b/sys/i386/xen/xen_machdep.c
@@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$");
#include <xen/hypervisor.h>
+#include <xen/xenstore/xenstorevar.h>
#include <machine/xen/xenvar.h>
#include <machine/xen/xenfunc.h>
#include <machine/xen/xenpmap.h>
@@ -710,9 +711,6 @@ char *bootmem_start, *bootmem_current, *bootmem_end;
pteinfo_t *pteinfo_list;
void initvalues(start_info_t *startinfo);
-struct xenstore_domain_interface;
-extern struct xenstore_domain_interface *xen_store;
-
void *
bootmem_alloc(unsigned int size)
{
diff --git a/sys/x86/xen/pv.c b/sys/x86/xen/pv.c
index 96420e3d5209..fa36f3ac9e86 100644
--- a/sys/x86/xen/pv.c
+++ b/sys/x86/xen/pv.c
@@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$");
#include <xen/xen-os.h>
#include <xen/hypervisor.h>
+#include <xen/xenstore/xenstorevar.h>
#include <xen/interface/vcpu.h>
diff --git a/sys/xen/xen-os.h b/sys/xen/xen-os.h
index 7dd9c7e44c38..c982d55dcc9a 100644
--- a/sys/xen/xen-os.h
+++ b/sys/xen/xen-os.h
@@ -54,7 +54,6 @@ extern shared_info_t *HYPERVISOR_shared_info;
extern start_info_t *HYPERVISOR_start_info;
/* XXX: we need to get rid of this and use HYPERVISOR_start_info directly */
-extern struct xenstore_domain_interface *xen_store;
extern char *console_page;
enum xen_domain_type {