From owner-svn-src-head@FreeBSD.ORG Sun Feb 9 14:35:44 2014 Return-Path: <owner-svn-src-head@FreeBSD.ORG> Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DF95D548; Sun, 9 Feb 2014 14:35:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B0B221A27; Sun, 9 Feb 2014 14:35:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s19EZilB060302; Sun, 9 Feb 2014 14:35:44 GMT (envelope-from ian@svn.freebsd.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s19EZiuW060300; Sun, 9 Feb 2014 14:35:44 GMT (envelope-from ian@svn.freebsd.org) Message-Id: <201402091435.s19EZiuW060300@svn.freebsd.org> From: Ian Lepore <ian@FreeBSD.org> Date: Sun, 9 Feb 2014 14:35:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r261656 - in head/sys/arm: arm include 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.17 Precedence: list List-Id: SVN commit messages for the src tree for head/-current <svn-src-head.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/> List-Post: <mailto:svn-src-head@freebsd.org> List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>, <mailto:svn-src-head-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 09 Feb 2014 14:35:45 -0000 Author: ian Date: Sun Feb 9 14:35:44 2014 New Revision: 261656 URL: http://svnweb.freebsd.org/changeset/base/261656 Log: Use vm_paddr_t, not vm_offset_t, when dealing with physical addresses. Pointed out by: alc Modified: head/sys/arm/arm/physmem.c head/sys/arm/include/physmem.h Modified: head/sys/arm/arm/physmem.c ============================================================================== --- head/sys/arm/arm/physmem.c Sun Feb 9 14:28:47 2014 (r261655) +++ head/sys/arm/arm/physmem.c Sun Feb 9 14:35:44 2014 (r261656) @@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$"); #define MAX_EXCNT 10 struct region { - vm_offset_t addr; + vm_paddr_t addr; vm_size_t size; uint32_t flags; }; @@ -90,7 +90,7 @@ vm_paddr_t dump_avail[MAX_AVAIL_ENTRIES long realmem; /* The address at which the kernel was loaded. Set early in initarm(). */ -vm_offset_t arm_physmem_kernaddr; +vm_paddr_t arm_physmem_kernaddr; /* * Print the contents of the physical and excluded region tables using the @@ -227,7 +227,7 @@ regions_to_avail(vm_paddr_t *avail, uint * Insertion-sort a new entry into a regions list; sorted by start address. */ static void -insert_region(struct region *regions, size_t rcnt, vm_offset_t addr, +insert_region(struct region *regions, size_t rcnt, vm_paddr_t addr, vm_size_t size, uint32_t flags) { size_t i; @@ -249,7 +249,7 @@ insert_region(struct region *regions, si * Add a hardware memory region. */ void -arm_physmem_hardware_region(vm_offset_t pa, vm_size_t sz) +arm_physmem_hardware_region(vm_paddr_t pa, vm_size_t sz) { vm_offset_t adj; @@ -277,7 +277,7 @@ arm_physmem_hardware_region(vm_offset_t /* * Add an exclusion region. */ -void arm_physmem_exclude_region(vm_offset_t pa, vm_size_t sz, uint32_t exflags) +void arm_physmem_exclude_region(vm_paddr_t pa, vm_size_t sz, uint32_t exflags) { vm_offset_t adj; Modified: head/sys/arm/include/physmem.h ============================================================================== --- head/sys/arm/include/physmem.h Sun Feb 9 14:28:47 2014 (r261655) +++ head/sys/arm/include/physmem.h Sun Feb 9 14:35:44 2014 (r261656) @@ -32,7 +32,7 @@ /* * The physical address at which the kernel was loaded. */ -extern vm_offset_t arm_physmem_kernaddr; +extern vm_paddr_t arm_physmem_kernaddr; /* * Routines to help configure physical ram. @@ -52,8 +52,8 @@ extern vm_offset_t arm_physmem_kernaddr; #define EXFLAG_NODUMP 0x01 #define EXFLAG_NOALLOC 0x02 -void arm_physmem_hardware_region(vm_offset_t pa, vm_size_t sz); -void arm_physmem_exclude_region(vm_offset_t pa, vm_size_t sz, uint32_t flags); +void arm_physmem_hardware_region(vm_paddr_t pa, vm_size_t sz); +void arm_physmem_exclude_region(vm_paddr_t pa, vm_size_t sz, uint32_t flags); void arm_physmem_init_kernel_globals(void); void arm_physmem_print_tables(void);