From owner-p4-projects@FreeBSD.ORG Sun Jun 13 04:05:24 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 611BE16A4DC; Sun, 13 Jun 2004 04:05:23 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 35F2216A4D1 for ; Sun, 13 Jun 2004 04:05:23 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1481E43D39 for ; Sun, 13 Jun 2004 04:05:23 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5D45IFM004205 for ; Sun, 13 Jun 2004 04:05:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5D45ITT004202 for perforce@freebsd.org; Sun, 13 Jun 2004 04:05:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 13 Jun 2004 04:05:18 GMT Message-Id: <200406130405.i5D45ITT004202@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 54777 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jun 2004 04:05:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=54777 Change 54777 by rwatson@rwatson_tislabs on 2004/06/13 04:04:45 Integ netperf_socket. Affected files ... .. //depot/projects/netperf_socket/sys/amd64/include/pmap.h#8 integrate .. //depot/projects/netperf_socket/sys/i386/include/pmap.h#6 integrate Differences ... ==== //depot/projects/netperf_socket/sys/amd64/include/pmap.h#8 (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.117 2004/06/08 01:02:52 peter Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.118 2004/06/13 03:44:11 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -226,8 +226,6 @@ LIST_ENTRY(pmap) pm_list; /* List of all pmaps */ }; -#define pmap_page_is_mapped(m) (!TAILQ_EMPTY(&(m)->md.pv_list)) - typedef struct pmap *pmap_t; #ifdef _KERNEL @@ -264,13 +262,14 @@ extern vm_offset_t virtual_avail; extern vm_offset_t virtual_end; +#define pmap_page_is_mapped(m) (!TAILQ_EMPTY(&(m)->md.pv_list)) + void pmap_bootstrap(vm_paddr_t *); void pmap_kenter(vm_offset_t va, vm_paddr_t pa); void *pmap_kenter_temporary(vm_paddr_t pa, int i); void pmap_kremove(vm_offset_t); void *pmap_mapdev(vm_paddr_t, vm_size_t); void pmap_unmapdev(vm_offset_t, vm_size_t); -pt_entry_t *pmap_pte_quick(pmap_t, vm_offset_t) __pure2; void pmap_invalidate_page(pmap_t, vm_offset_t); void pmap_invalidate_range(pmap_t, vm_offset_t, vm_offset_t); void pmap_invalidate_all(pmap_t); ==== //depot/projects/netperf_socket/sys/i386/include/pmap.h#6 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/include/pmap.h,v 1.108 2004/04/10 23:28:49 alc Exp $ + * $FreeBSD: src/sys/i386/include/pmap.h,v 1.109 2004/06/13 03:44:11 alc Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -287,8 +287,6 @@ #endif }; -#define pmap_page_is_mapped(m) (!TAILQ_EMPTY(&(m)->md.pv_list)) - typedef struct pmap *pmap_t; #ifdef _KERNEL @@ -328,6 +326,8 @@ extern vm_offset_t virtual_avail; extern vm_offset_t virtual_end; +#define pmap_page_is_mapped(m) (!TAILQ_EMPTY(&(m)->md.pv_list)) + void pmap_bootstrap(vm_paddr_t, vm_paddr_t); void pmap_kenter(vm_offset_t va, vm_paddr_t pa); void *pmap_kenter_temporary(vm_paddr_t pa, int i);