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)
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
