Date: Thu, 18 Feb 2016 15:44:45 +0000 (UTC) From: Zbigniew Bodek <zbb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r295762 - in head/sys: dev/ofw kern Message-ID: <201602181544.u1IFijc5011107@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zbb Date: Thu Feb 18 15:44:45 2016 New Revision: 295762 URL: https://svnweb.freebsd.org/changeset/base/295762 Log: 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 Modified: head/sys/dev/ofw/ofw_subr.c head/sys/kern/subr_bus.c Modified: head/sys/dev/ofw/ofw_subr.c ============================================================================== --- head/sys/dev/ofw/ofw_subr.c Thu Feb 18 15:28:57 2016 (r295761) +++ head/sys/dev/ofw/ofw_subr.c Thu Feb 18 15:44:45 2016 (r295762) @@ -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> Modified: head/sys/kern/subr_bus.c ============================================================================== --- head/sys/kern/subr_bus.c Thu Feb 18 15:28:57 2016 (r295761) +++ head/sys/kern/subr_bus.c Thu Feb 18 15:44:45 2016 (r295762) @@ -4107,7 +4107,7 @@ bus_generic_get_bus_tag(device_t dev, de /* 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)); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602181544.u1IFijc5011107>