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
This commit is contained in:
Zbigniew Bodek 2016-02-18 15:44:45 +00:00
parent 229f3f0d9c
commit 910905c74f
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=295762
2 changed files with 3 additions and 2 deletions

View File

@ -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>

View File

@ -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));
}