Date: Tue, 8 Jun 2004 00:35:03 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 54373 for review Message-ID: <200406080035.i580Z368074926@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=54373 Change 54373 by peter@peter_hammer on 2004/06/08 00:34:05 IFC @54372 Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#76 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#35 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#76 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.462 2004/06/07 23:51:20 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.464 2004/06/08 00:29:41 peter Exp $"); /* * Manages physical address maps. @@ -1850,7 +1850,7 @@ if (pmap == NULL) return; - va &= (~(vm_paddr_t)PAGE_MASK); + va = trunc_page(va); #ifdef PMAP_DIAGNOSTIC if (va > VM_MAX_KERNEL_ADDRESS) panic("pmap_enter: toobig"); @@ -2779,7 +2779,7 @@ /* If we gave a direct map region in pmap_mapdev, do nothing */ if (va >= DMAP_MIN_ADDRESS && va < DMAP_MAX_ADDRESS) return; - base = va & (~(vm_paddr_t)PAGE_MASK); + base = trunc_page(va); offset = va & PAGE_MASK; size = roundup(offset + size, PAGE_SIZE); for (tmpva = base; tmpva < (base + size); tmpva += PAGE_SIZE) ==== //depot/projects/hammer/sys/amd64/include/pmap.h#35 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.115 2004/05/16 20:44:41 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.116 2004/06/08 00:29:42 peter Exp $ */ #ifndef _MACHINE_PMAP_H_
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200406080035.i580Z368074926>