From owner-svn-src-all@freebsd.org  Thu Feb 18 15:44:47 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0358AAAD82C;
 Thu, 18 Feb 2016 15:44:47 +0000 (UTC) (envelope-from zbb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C4A951558;
 Thu, 18 Feb 2016 15:44:46 +0000 (UTC) (envelope-from zbb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1IFij8t011109;
 Thu, 18 Feb 2016 15:44:45 GMT (envelope-from zbb@FreeBSD.org)
Received: (from zbb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1IFijc5011107;
 Thu, 18 Feb 2016 15:44:45 GMT (envelope-from zbb@FreeBSD.org)
Message-Id: <201602181544.u1IFijc5011107@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: zbb set sender to zbb@FreeBSD.org
 using -f
From: Zbigniew Bodek <zbb@FreeBSD.org>
Date: Thu, 18 Feb 2016 15:44:45 +0000 (UTC)
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
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Feb 2016 15:44:47 -0000

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