From owner-p4-projects@FreeBSD.ORG Thu Dec 6 07:00:50 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CCF2016A473; Thu, 6 Dec 2007 07:00:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5A6CB16A46E for ; Thu, 6 Dec 2007 07:00:49 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4248413C468 for ; Thu, 6 Dec 2007 07:00:49 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB670nFB063762 for ; Thu, 6 Dec 2007 07:00:49 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB670nwC063759 for perforce@freebsd.org; Thu, 6 Dec 2007 07:00:49 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 6 Dec 2007 07:00:49 GMT Message-Id: <200712060700.lB670nwC063759@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 130323 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Dec 2007 07:00:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=130323 Change 130323 by kmacy@entropy_kmacy_xen31 on 2007/12/06 07:00:01 import xenbus (may move later) - resolve most link time errors Affected files ... .. //depot/projects/xen31/sys/conf/files#7 edit .. //depot/projects/xen31/sys/conf/files.i386#6 edit .. //depot/projects/xen31/sys/i386/xen/pmap.c#4 edit .. //depot/projects/xen31/sys/libkern/strcspn.c#1 add .. //depot/projects/xen31/sys/sys/libkern.h#2 edit .. //depot/projects/xen31/sys/xen/evtchn.c#1 add .. //depot/projects/xen31/sys/xen/gnttab.h#1 add Differences ... ==== //depot/projects/xen31/sys/conf/files#7 (text+ko) ==== @@ -1585,6 +1585,7 @@ libkern/strcat.c standard libkern/strcmp.c standard libkern/strcpy.c standard +libkern/strcspn.c standard libkern/strdup.c standard libkern/strlcat.c standard libkern/strlcpy.c standard @@ -2106,6 +2107,8 @@ vm/vm_unix.c standard vm/vm_zeroidle.c standard vm/vnode_pager.c standard +xen/gnttab.c optional xen +xen/evtchn.c optional xen # gnu/fs/xfs/xfs_alloc.c optional xfs \ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" \ ==== //depot/projects/xen31/sys/conf/files.i386#6 (text+ko) ==== @@ -244,6 +244,11 @@ dev/syscons/scvtb.c optional sc dev/uart/uart_cpu_i386.c optional uart dev/acpica/acpi_if.m standard +dev/xen/xenbus/xenbus_client.c optional xen +dev/xen/xenbus/xenbus_comms.c optional xen +dev/xen/xenbus/xenbus_dev.c optional xen +dev/xen/xenbus/xenbus_probe.c optional xen +dev/xen/xenbus/xenbus_xs.c optional xen dev/wpi/if_wpi.c optional wpi i386/acpica/OsdEnvironment.c optional acpi i386/acpica/acpi_machdep.c optional acpi ==== //depot/projects/xen31/sys/i386/xen/pmap.c#4 (text+ko) ==== @@ -3247,6 +3247,37 @@ return (FALSE); } +/* + * pmap_page_wired_mappings: + * + * Return the number of managed mappings to the given physical page + * that are wired. + */ +int +pmap_page_wired_mappings(vm_page_t m) +{ + pv_entry_t pv; + pt_entry_t *pte; + pmap_t pmap; + int count; + + count = 0; + if ((m->flags & PG_FICTITIOUS) != 0) + return (count); + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + sched_pin(); + TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { + pmap = PV_PMAP(pv); + PMAP_LOCK(pmap); + pte = pmap_pte_quick(pmap, pv->pv_va); + if ((*pte & PG_W) != 0) + count++; + PMAP_UNLOCK(pmap); + } + sched_unpin(); + return (count); +} + /* * Remove all pages from specified address space * this aids process exit speeds. Also, this code ==== //depot/projects/xen31/sys/sys/libkern.h#2 (text+ko) ==== @@ -101,6 +101,7 @@ char *strcat(char * __restrict, const char * __restrict); int strcmp(const char *, const char *); char *strcpy(char * __restrict, const char * __restrict); +size_t strcspn(const char *s, const char *charset); char *strdup(const char *__restrict, struct malloc_type *); size_t strlcat(char *, const char *, size_t); size_t strlcpy(char *, const char *, size_t);