From owner-svn-src-all@freebsd.org Mon Mar 21 22:19:55 2016 Return-Path: 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 006B8AD8FFE; Mon, 21 Mar 2016 22:19:55 +0000 (UTC) (envelope-from jhibbits@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 C3CA1A94; Mon, 21 Mar 2016 22:19:54 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2LMJr38045543; Mon, 21 Mar 2016 22:19:53 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2LMJrb5045539; Mon, 21 Mar 2016 22:19:53 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201603212219.u2LMJrb5045539@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Mon, 21 Mar 2016 22:19:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r297170 - in head/sys/dev: mvs siis 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.21 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Mar 2016 22:19:55 -0000 Author: jhibbits Date: Mon Mar 21 22:19:53 2016 New Revision: 297170 URL: https://svnweb.freebsd.org/changeset/base/297170 Log: Fix some more long -> rman_res_t Reported by: Michael Butler (siis breakage) Modified: head/sys/dev/mvs/mvs_pci.c head/sys/dev/mvs/mvs_soc.c head/sys/dev/siis/siis.c Modified: head/sys/dev/mvs/mvs_pci.c ============================================================================== --- head/sys/dev/mvs/mvs_pci.c Mon Mar 21 22:14:48 2016 (r297169) +++ head/sys/dev/mvs/mvs_pci.c Mon Mar 21 22:19:53 2016 (r297170) @@ -396,7 +396,7 @@ mvs_alloc_resource(device_t dev, device_ int unit = ((struct mvs_channel *)device_get_softc(child))->unit; struct resource *res = NULL; int offset = HC_BASE(unit >> 2) + PORT_BASE(unit & 0x03); - long st; + rman_res_t st; switch (type) { case SYS_RES_MEMORY: Modified: head/sys/dev/mvs/mvs_soc.c ============================================================================== --- head/sys/dev/mvs/mvs_soc.c Mon Mar 21 22:14:48 2016 (r297169) +++ head/sys/dev/mvs/mvs_soc.c Mon Mar 21 22:19:53 2016 (r297170) @@ -342,7 +342,7 @@ mvs_alloc_resource(device_t dev, device_ int unit = ((struct mvs_channel *)device_get_softc(child))->unit; struct resource *res = NULL; int offset = PORT_BASE(unit & 0x03); - long st; + rman_res_t st; switch (type) { case SYS_RES_MEMORY: Modified: head/sys/dev/siis/siis.c ============================================================================== --- head/sys/dev/siis/siis.c Mon Mar 21 22:14:48 2016 (r297169) +++ head/sys/dev/siis/siis.c Mon Mar 21 22:19:53 2016 (r297170) @@ -320,7 +320,7 @@ siis_alloc_resource(device_t dev, device int unit = ((struct siis_channel *)device_get_softc(child))->unit; struct resource *res = NULL; int offset = unit << 13; - long st; + rman_res_t st; switch (type) { case SYS_RES_MEMORY: