From owner-svn-src-stable-11@freebsd.org Wed Jun 13 20:33:53 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9687C1013030; Wed, 13 Jun 2018 20:33:53 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1974E7A0D0; Wed, 13 Jun 2018 20:33:53 +0000 (UTC) (envelope-from dim@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EF2381E77C; Wed, 13 Jun 2018 20:33:52 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5DKXqBV055620; Wed, 13 Jun 2018 20:33:52 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5DKXqXs055619; Wed, 13 Jun 2018 20:33:52 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201806132033.w5DKXqXs055619@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Wed, 13 Jun 2018 20:33:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r335087 - stable/11/sys/dev/si X-SVN-Group: stable-11 X-SVN-Commit-Author: dim X-SVN-Commit-Paths: stable/11/sys/dev/si X-SVN-Commit-Revision: 335087 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jun 2018 20:33:54 -0000 Author: dim Date: Wed Jun 13 20:33:52 2018 New Revision: 335087 URL: https://svnweb.freebsd.org/changeset/base/335087 Log: Fix build of si with base gcc on i386 Casting from rman_res_t to a pointer results in "cast to pointer from integer of different size" warnings with base gcc on i386, so use intermediate casts to uintptr_t to suppress these. Direct commit to stable/11, since si(4) has been removed from head. Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D15752 Modified: stable/11/sys/dev/si/si_isa.c stable/11/sys/dev/si/si_pci.c Modified: stable/11/sys/dev/si/si_isa.c ============================================================================== --- stable/11/sys/dev/si/si_isa.c Wed Jun 13 20:25:36 2018 (r335086) +++ stable/11/sys/dev/si/si_isa.c Wed Jun 13 20:33:52 2018 (r335087) @@ -65,7 +65,7 @@ si_isa_probe(device_t dev) device_printf(dev, "cannot allocate memory resource\n"); return ENXIO; } - paddr = (caddr_t)rman_get_start(sc->sc_mem_res);/* physical */ + paddr = (caddr_t)(uintptr_t)rman_get_start(sc->sc_mem_res);/* physical */ maddr = rman_get_virtual(sc->sc_mem_res); /* in kvm */ DPRINT((0, DBG_AUTOBOOT, "si%d: probe at virtual=0x%x physical=0x%x\n", @@ -279,7 +279,7 @@ si_isa_attach(device_t dev) device_printf(dev, "couldn't map memory\n"); goto fail; } - sc->sc_paddr = (caddr_t)rman_get_start(sc->sc_mem_res); + sc->sc_paddr = (caddr_t)(uintptr_t)rman_get_start(sc->sc_mem_res); sc->sc_maddr = rman_get_virtual(sc->sc_mem_res); sc->sc_irq_rid = 0; Modified: stable/11/sys/dev/si/si_pci.c ============================================================================== --- stable/11/sys/dev/si/si_pci.c Wed Jun 13 20:25:36 2018 (r335086) +++ stable/11/sys/dev/si/si_pci.c Wed Jun 13 20:33:52 2018 (r335087) @@ -86,7 +86,7 @@ si_pci_attach(device_t dev) device_printf(dev, "couldn't map memory\n"); goto fail; } - sc->sc_paddr = (caddr_t)rman_get_start(sc->sc_mem_res); + sc->sc_paddr = (caddr_t)(uintptr_t)rman_get_start(sc->sc_mem_res); sc->sc_maddr = rman_get_virtual(sc->sc_mem_res); sc->sc_irq_rid = 0;