From owner-p4-projects@FreeBSD.ORG  Thu Dec 20 12:47:52 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0979116A419; Thu, 20 Dec 2007 12:47:52 +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 8FDD316A41B
	for <perforce@freebsd.org>; Thu, 20 Dec 2007 12:47:51 +0000 (UTC)
	(envelope-from raj@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8445513C4CC
	for <perforce@freebsd.org>; Thu, 20 Dec 2007 12:47:51 +0000 (UTC)
	(envelope-from raj@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 lBKClpLQ061588
	for <perforce@freebsd.org>; Thu, 20 Dec 2007 12:47:51 GMT
	(envelope-from raj@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBKClpT4061585
	for perforce@freebsd.org; Thu, 20 Dec 2007 12:47:51 GMT
	(envelope-from raj@freebsd.org)
Date: Thu, 20 Dec 2007 12:47:51 GMT
Message-Id: <200712201247.lBKClpT4061585@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	raj@freebsd.org using -f
From: Rafal Jaworowski <raj@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 131305 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Dec 2007 12:47:52 -0000

http://perforce.freebsd.org/chv.cgi?CH=131305

Change 131305 by raj@raj_mimi on 2007/12/20 12:47:41

	Catch up with recent -current merges, so e500 builds again

Affected files ...

.. //depot/projects/e500/sys/powerpc/booke/machdep.c#3 edit
.. //depot/projects/e500/sys/powerpc/booke/pmap.c#4 edit

Differences ...

==== //depot/projects/e500/sys/powerpc/booke/machdep.c#3 (text+ko) ====

@@ -162,8 +162,6 @@
 
 struct bootinfo *bootinfo;
 
-extern vm_offset_t kstack0[];
-
 char machine[] = "powerpc";
 SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, machine, 0, "");
 

==== //depot/projects/e500/sys/powerpc/booke/pmap.c#4 (text+ko) ====

@@ -1241,7 +1241,7 @@
  * Initialize a preallocated and zeroed pmap structure,
  * such as one in a vmspace structure.
  */
-void
+int
 pmap_pinit(pmap_t pmap)
 {
 	//struct thread *td;
@@ -1263,6 +1263,7 @@
 	TAILQ_INIT(&pmap->ptbl_list);
 
 	//debugf("pmap_pinit: e\n");
+	return (1);
 }
 
 /*
@@ -2162,6 +2163,33 @@
 	return (FALSE);
 }
 
+/*
+ * 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;
+	pte_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);
+	TAILQ_FOREACH(pv, &m->md.pv_list, pv_link) {
+		pmap = pv->pv_pmap;
+		PMAP_LOCK(pmap);
+		if ((pte = pte_find(pmap, pv->pv_va)) != NULL)
+			if (PTE_ISWIRED(pte))
+				count++;
+		PMAP_UNLOCK(pmap);
+	}
+	return (count);
+}
+
 int
 pmap_dev_direct_mapped(vm_offset_t pa, vm_size_t size)
 {