Fix build for i386 and arm64 after r295755

- Take bus_space_tag_t type into consideration when returning
  default, zero value.
- Include missing rman.h required by ofw_pci.h

2 files changed, 3 insertions, 2 deletions

diff --git a/sys/dev/ofw/ofw_subr.c b/sys/dev/ofw/ofw_subr.c
index be31ccb..e9b66c2 100644
--- a/sys/dev/ofw/ofw_subr.c
+++ b/sys/dev/ofw/ofw_subr.c
@@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/libkern.h>
+#include <sys/rman.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c
index 3e4568b..22cddea 100644
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -4107,7 +4107,7 @@ bus_generic_get_bus_tag(device_t dev, device_t child)
 	/* Propagate up the bus hierarchy until someone handles it. */
 	if (dev->parent != NULL)
 		return (BUS_GET_BUS_TAG(dev->parent, child));
-	return (NULL);
+	return ((bus_space_tag_t)0);
 }
 
 /**
@@ -4604,7 +4604,7 @@ bus_get_bus_tag(device_t dev)
 
 	parent = device_get_parent(dev);
 	if (parent == NULL)
-		return (NULL);
+		return ((bus_space_tag_t)0);
 	return (BUS_GET_BUS_TAG(parent, dev));
 }