From: Julien Grall <julien.grall@citrix.com>
Date: Sat, 29 Aug 2015 21:22:23 +0000 (+0100)
Subject: Aarch64
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a1fad1c56fecbd391224bdd708335fe8f75802e3;p=people%2Fjulieng%2Ffreebsd.git

Aarch64
---

diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c
index ab59e5e5972c..2a14c2633923 100644
--- a/sys/arm64/arm64/pmap.c
+++ b/sys/arm64/arm64/pmap.c
@@ -883,7 +883,7 @@ pmap_kextract(vm_offset_t va)
  * Add a wired page to the kva.
  * Note: not SMP coherent.
  */
-PMAP_INLINE void 
+void
 pmap_kenter(vm_offset_t va, vm_paddr_t pa)
 {
 	pt_entry_t *l3;
diff --git a/sys/arm64/conf/GENERIC b/sys/arm64/conf/GENERIC
index 5adaf6484125..c06d857a1190 100644
--- a/sys/arm64/conf/GENERIC
+++ b/sys/arm64/conf/GENERIC
@@ -23,6 +23,8 @@ ident		GENERIC
 
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 makeoptions	NO_MODULES=1		# We don't yet support modules on arm64
+options 	ROOTDEVNAME=\"ufs:xbd0s2\"
+
 
 options		XENHVM
 options 	SCHED_ULE		# ULE scheduler
diff --git a/sys/arm64/include/pmap.h b/sys/arm64/include/pmap.h
index e109de2816d8..bcbd479d1c39 100644
--- a/sys/arm64/include/pmap.h
+++ b/sys/arm64/include/pmap.h
@@ -135,6 +135,7 @@ extern vm_offset_t virtual_end;
 	((((va) | (pa)) & L1_OFFSET) == 0 && (size) >= L1_SIZE)
 
 void	pmap_bootstrap(vm_offset_t, vm_paddr_t, vm_size_t);
+void	pmap_kenter(vm_offset_t va, vm_paddr_t pa);
 void	pmap_kenter_device(vm_offset_t, vm_size_t, vm_paddr_t);
 vm_paddr_t pmap_kextract(vm_offset_t va);
 void	pmap_kremove(vm_offset_t);
diff --git a/sys/dev/xen/blkfront/blkfront.c b/sys/dev/xen/blkfront/blkfront.c
index 6768749c3d39..788ce1ee17d5 100644
--- a/sys/dev/xen/blkfront/blkfront.c
+++ b/sys/dev/xen/blkfront/blkfront.c
@@ -1373,8 +1373,10 @@ xbd_probe(device_t dev)
 	if (strcmp(xenbus_get_type(dev), "vbd") != 0)
 		return (ENXIO);
 
+#if 0
 	if (xen_hvm_domain() && xen_disable_pv_disks != 0)
 		return (ENXIO);
+#endif
 
 	if (xen_hvm_domain()) {
 		int error;
diff --git a/sys/dev/xen/netfront/netfront.c b/sys/dev/xen/netfront/netfront.c
index a6cf693b7ece..38926571fc6d 100644
--- a/sys/dev/xen/netfront/netfront.c
+++ b/sys/dev/xen/netfront/netfront.c
@@ -447,8 +447,10 @@ static int
 netfront_probe(device_t dev)
 {
 
+#if 0
 	if (xen_hvm_domain() && xen_disable_pv_nics != 0)
 		return (ENXIO);
+#endif
 
 	if (!strcmp(xenbus_get_type(dev), "vif")) {
 		device_set_desc(dev, "Virtual Network Interface");