From owner-p4-projects@FreeBSD.ORG  Fri Apr  4 18:05:26 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CF86A37B404; Fri,  4 Apr 2003 18:05:25 -0800 (PST)
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 6DEF537B401
	for <perforce@freebsd.org>; Fri,  4 Apr 2003 18:05:25 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 18C1A43F85
	for <perforce@freebsd.org>; Fri,  4 Apr 2003 18:05:25 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h3525O0U092808
	for <perforce@freebsd.org>; Fri, 4 Apr 2003 18:05:24 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3525OCi092805
	for perforce@freebsd.org; Fri, 4 Apr 2003 18:05:24 -0800 (PST)
Date: Fri, 4 Apr 2003 18:05:24 -0800 (PST)
Message-Id: <200304050205.h3525OCi092805@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 28122 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Sat, 05 Apr 2003 02:05:26 -0000

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

Change 28122 by peter@peter_daintree on 2003/04/04 18:04:27

	implement pte_load_clear() using native instructions

Affected files ...

.. //depot/projects/hammer/sys/x86_64/include/pmap.h#7 edit

Differences ...

==== //depot/projects/hammer/sys/x86_64/include/pmap.h#7 (text+ko) ====

@@ -189,29 +189,8 @@
 
 #define	vtophys(va)	pmap_kextract(((vm_offset_t) (va)))
 
-#ifdef PAE
-
-static __inline pt_entry_t
-pte_load_clear(pt_entry_t *pte)
-{
-	pt_entry_t r;
+#define	pte_load_clear(pte)	atomic_readandclear_long(pte)
 
-	r = *pte;
-	__asm __volatile(
-	    "1:\n"
-	    "\tcmpxchg8b %1\n"
-	    "\tjnz 1b"
-	    : "+A" (r)
-	    : "m" (*pte), "b" (0), "c" (0));
-	return (r);
-}
-
-#else
-
-#define	pte_load_clear(pte)	atomic_readandclear_int(pte)
-
-#endif
-
 #endif
 
 /*
@@ -228,7 +207,7 @@
 	pd_entry_t		*pm_pdir;	/* KVA of page directory */
 	vm_object_t		pm_pteobj;	/* Container for pte's */
 	TAILQ_HEAD(,pv_entry)	pm_pvlist;	/* list of mappings in pmap */
-	u_int			pm_active;	/* active on cpus */
+	u_long			pm_active;	/* active on cpus */
 	struct pmap_statistics	pm_stats;	/* pmap statistics */
 	LIST_ENTRY(pmap) 	pm_list;	/* List of all pmaps */
 #ifdef PAE