From owner-svn-src-head@freebsd.org Tue May 16 03:31:51 2017 Return-Path: Delivered-To: svn-src-head@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 5D5BED6F65E; Tue, 16 May 2017 03:31:51 +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 142C3104A; Tue, 16 May 2017 03:31:51 +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 v4G3Vovm087430; Tue, 16 May 2017 03:31:50 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4G3VnhK087426; Tue, 16 May 2017 03:31:49 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201705160331.v4G3VnhK087426@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Tue, 16 May 2017 03:31:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r318335 - in head/sys/powerpc: include powerpc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 May 2017 03:31:51 -0000 Author: jhibbits Date: Tue May 16 03:31:49 2017 New Revision: 318335 URL: https://svnweb.freebsd.org/changeset/base/318335 Log: Correct pa argument type for pmap_kenter_attr() Physical addresses are vm_paddr_t, not vm_offset_t. This can make a difference when sizeof(vm_offset_t) != sizeof(vm_paddr_t). Modified: head/sys/powerpc/include/pmap.h head/sys/powerpc/powerpc/bus_machdep.c head/sys/powerpc/powerpc/pmap_dispatch.c Modified: head/sys/powerpc/include/pmap.h ============================================================================== --- head/sys/powerpc/include/pmap.h Tue May 16 03:12:51 2017 (r318334) +++ head/sys/powerpc/include/pmap.h Tue May 16 03:31:49 2017 (r318335) @@ -251,7 +251,7 @@ extern struct pmap kernel_pmap_store; void pmap_bootstrap(vm_offset_t, vm_offset_t); void pmap_kenter(vm_offset_t va, vm_paddr_t pa); -void pmap_kenter_attr(vm_offset_t va, vm_offset_t pa, vm_memattr_t); +void pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, vm_memattr_t); void pmap_kremove(vm_offset_t); void *pmap_mapdev(vm_paddr_t, vm_size_t); void *pmap_mapdev_attr(vm_paddr_t, vm_size_t, vm_memattr_t); Modified: head/sys/powerpc/powerpc/bus_machdep.c ============================================================================== --- head/sys/powerpc/powerpc/bus_machdep.c Tue May 16 03:12:51 2017 (r318334) +++ head/sys/powerpc/powerpc/bus_machdep.c Tue May 16 03:31:49 2017 (r318335) @@ -105,8 +105,9 @@ bs_gen_map(bus_addr_t addr, bus_size_t s void bs_remap_earlyboot(void) { + vm_paddr_t pa, spa; + vm_offset_t va; int i; - vm_offset_t pa, spa, va; vm_memattr_t ma; for (i = 0; i < earlyboot_map_idx; i++) { Modified: head/sys/powerpc/powerpc/pmap_dispatch.c ============================================================================== --- head/sys/powerpc/powerpc/pmap_dispatch.c Tue May 16 03:12:51 2017 (r318334) +++ head/sys/powerpc/powerpc/pmap_dispatch.c Tue May 16 03:31:49 2017 (r318335) @@ -495,7 +495,7 @@ pmap_kenter(vm_offset_t va, vm_paddr_t p } void -pmap_kenter_attr(vm_offset_t va, vm_offset_t pa, vm_memattr_t ma) +pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, vm_memattr_t ma) { CTR4(KTR_PMAP, "%s(%#x, %#x, %#x)", __func__, va, pa, ma);