Aarch64

diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c
index ab59e5e5972c07d021e64a5319ff44e6cda12b03..2a14c26339230eac0c93e207604bede3b86b39e7 100644 (file)
--- 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 5adaf6484125f6ca605bf0aa91dfd0ca1bcc86aa..c06d857a11902ed4044a9e840def619d797cc10f 100644 (file)
--- 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 e109de2816d81495faaac8812fb11180420eb9fe..bcbd479d1c39074125766a09a4f1ac5fe448938e 100644 (file)
--- 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 6768749c3d39a231c345a9d5a521201ca5f4aa0f..788ce1ee17d59685b379cd071fd0f8164cb90baa 100644 (file)
--- 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 a6cf693b7eced320a2aec509c640ad32357598af..38926571fc6dc93be6ad417258a58b576a17b7be 100644 (file)
--- 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");