From owner-svn-src-head@FreeBSD.ORG Fri Feb 15 22:43:09 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id CAA1BD15; Fri, 15 Feb 2013 22:43:09 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 8B356AB2; Fri, 15 Feb 2013 22:43:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1FMh9uC029327; Fri, 15 Feb 2013 22:43:09 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1FMh8kZ029319; Fri, 15 Feb 2013 22:43:08 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201302152243.r1FMh8kZ029319@svn.freebsd.org> From: Jung-uk Kim Date: Fri, 15 Feb 2013 22:43:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r246855 - in head/sys: amd64/acpica amd64/amd64 i386/acpica i386/i386 i386/xen 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.14 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: Fri, 15 Feb 2013 22:43:09 -0000 Author: jkim Date: Fri Feb 15 22:43:08 2013 New Revision: 246855 URL: http://svnweb.freebsd.org/changeset/base/246855 Log: Consistently use round_page(x) rather than roundup(x, PAGE_SIZE). There is no functional change. Modified: head/sys/amd64/acpica/acpi_machdep.c head/sys/amd64/amd64/pmap.c head/sys/i386/acpica/acpi_machdep.c head/sys/i386/i386/pmap.c head/sys/i386/xen/pmap.c Modified: head/sys/amd64/acpica/acpi_machdep.c ============================================================================== --- head/sys/amd64/acpica/acpi_machdep.c Fri Feb 15 21:49:12 2013 (r246854) +++ head/sys/amd64/acpica/acpi_machdep.c Fri Feb 15 22:43:08 2013 (r246855) @@ -122,7 +122,7 @@ table_map(vm_paddr_t pa, int offset, vm_ void *data; off = pa & PAGE_MASK; - length = roundup(length + off, PAGE_SIZE); + length = round_page(length + off); pa = pa & PG_FRAME; va = (vm_offset_t)pmap_kenter_temporary(pa, offset) + (offset * PAGE_SIZE); @@ -146,7 +146,7 @@ table_unmap(void *data, vm_offset_t leng va = (vm_offset_t)data; off = va & PAGE_MASK; - length = roundup(length + off, PAGE_SIZE); + length = round_page(length + off); va &= ~PAGE_MASK; while (length > 0) { pmap_kremove(va); Modified: head/sys/amd64/amd64/pmap.c ============================================================================== --- head/sys/amd64/amd64/pmap.c Fri Feb 15 21:49:12 2013 (r246854) +++ head/sys/amd64/amd64/pmap.c Fri Feb 15 22:43:08 2013 (r246855) @@ -5015,7 +5015,7 @@ pmap_mapdev_attr(vm_paddr_t pa, vm_size_ return ((void *)va); } offset = pa & PAGE_MASK; - size = roundup(offset + size, PAGE_SIZE); + size = round_page(offset + size); va = kmem_alloc_nofault(kernel_map, size); if (!va) panic("pmap_mapdev: Couldn't alloc kernel virtual memory"); @@ -5051,7 +5051,7 @@ pmap_unmapdev(vm_offset_t va, vm_size_t return; base = trunc_page(va); offset = va & PAGE_MASK; - size = roundup(offset + size, PAGE_SIZE); + size = round_page(offset + size); kmem_free(kernel_map, base, size); } @@ -5173,7 +5173,7 @@ pmap_change_attr_locked(vm_offset_t va, PMAP_LOCK_ASSERT(kernel_pmap, MA_OWNED); base = trunc_page(va); offset = va & PAGE_MASK; - size = roundup(offset + size, PAGE_SIZE); + size = round_page(offset + size); /* * Only supported on kernel virtual addresses, including the direct Modified: head/sys/i386/acpica/acpi_machdep.c ============================================================================== --- head/sys/i386/acpica/acpi_machdep.c Fri Feb 15 21:49:12 2013 (r246854) +++ head/sys/i386/acpica/acpi_machdep.c Fri Feb 15 22:43:08 2013 (r246855) @@ -139,7 +139,7 @@ table_map(vm_paddr_t pa, int offset, vm_ void *data; off = pa & PAGE_MASK; - length = roundup(length + off, PAGE_SIZE); + length = round_page(length + off); pa = pa & PG_FRAME; va = (vm_offset_t)pmap_kenter_temporary(pa, offset) + (offset * PAGE_SIZE); @@ -163,7 +163,7 @@ table_unmap(void *data, vm_offset_t leng va = (vm_offset_t)data; off = va & PAGE_MASK; - length = roundup(length + off, PAGE_SIZE); + length = round_page(length + off); va &= ~PAGE_MASK; while (length > 0) { pmap_kremove(va); Modified: head/sys/i386/i386/pmap.c ============================================================================== --- head/sys/i386/i386/pmap.c Fri Feb 15 21:49:12 2013 (r246854) +++ head/sys/i386/i386/pmap.c Fri Feb 15 22:43:08 2013 (r246855) @@ -4989,7 +4989,7 @@ pmap_mapdev_attr(vm_paddr_t pa, vm_size_ vm_size_t tmpsize; offset = pa & PAGE_MASK; - size = roundup(offset + size, PAGE_SIZE); + size = round_page(offset + size); pa = pa & PG_FRAME; if (pa < KERNLOAD && pa + size <= KERNLOAD) @@ -5029,7 +5029,7 @@ pmap_unmapdev(vm_offset_t va, vm_size_t return; base = trunc_page(va); offset = va & PAGE_MASK; - size = roundup(offset + size, PAGE_SIZE); + size = round_page(offset + size); kmem_free(kernel_map, base, size); } @@ -5120,7 +5120,7 @@ pmap_change_attr(vm_offset_t va, vm_size base = trunc_page(va); offset = va & PAGE_MASK; - size = roundup(offset + size, PAGE_SIZE); + size = round_page(offset + size); /* * Only supported on kernel virtual addresses above the recursive map. Modified: head/sys/i386/xen/pmap.c ============================================================================== --- head/sys/i386/xen/pmap.c Fri Feb 15 21:49:12 2013 (r246854) +++ head/sys/i386/xen/pmap.c Fri Feb 15 22:43:08 2013 (r246855) @@ -3973,7 +3973,7 @@ pmap_mapdev_attr(vm_paddr_t pa, vm_size_ vm_size_t tmpsize; offset = pa & PAGE_MASK; - size = roundup(offset + size, PAGE_SIZE); + size = round_page(offset + size); pa = pa & PG_FRAME; if (pa < KERNLOAD && pa + size <= KERNLOAD) @@ -4013,7 +4013,7 @@ pmap_unmapdev(vm_offset_t va, vm_size_t return; base = trunc_page(va); offset = va & PAGE_MASK; - size = roundup(offset + size, PAGE_SIZE); + size = round_page(offset + size); kmem_free(kernel_map, base, size); } @@ -4105,7 +4105,7 @@ pmap_change_attr(vm_offset_t va, vm_size base = trunc_page(va); offset = va & PAGE_MASK; - size = roundup(offset + size, PAGE_SIZE); + size = round_page(offset + size); /* Only supported on kernel virtual addresses. */ if (base <= VM_MAXUSER_ADDRESS)