From owner-p4-projects@FreeBSD.ORG  Sun Jul  1 10:47:39 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0A44016A468; Sun,  1 Jul 2007 10:47:39 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 5473616A41F
	for <perforce@freebsd.org>; Sun,  1 Jul 2007 10:47:38 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 46C7713C46E
	for <perforce@freebsd.org>; Sun,  1 Jul 2007 10:47:38 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l61AlcF0000962
	for <perforce@freebsd.org>; Sun, 1 Jul 2007 10:47:38 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l61AlcbL000959
	for perforce@freebsd.org; Sun, 1 Jul 2007 10:47:38 GMT
	(envelope-from peter@freebsd.org)
Date: Sun, 1 Jul 2007 10:47:38 GMT
Message-Id: <200707011047.l61AlcbL000959@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>
Cc: 
Subject: PERFORCE change 122634 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: Sun, 01 Jul 2007 10:47:39 -0000

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

Change 122634 by peter@peter_melody on 2007/07/01 10:47:23

	Make gcc4.2 happy.  I suspect it would be better to just
	let the unit-at-a-time mode decide what to inline.

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#160 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#160 (text+ko) ====

@@ -831,16 +831,23 @@
  * Normal, non-SMP, invalidation functions.
  * We inline these within pmap.c for speed.
  */
-PMAP_INLINE void
-pmap_invalidate_page(pmap_t pmap, vm_offset_t va)
+static __inline void
+_pmap_invalidate_page(pmap_t pmap, vm_offset_t va)
 {
 
 	if (pmap == kernel_pmap || pmap->pm_active)
 		invlpg(va);
 }
+void
+pmap_invalidate_page(pmap_t pmap, vm_offset_t va)
+{
+
+	_pmap_invalidate_page(pmap, va);
+}
+#define pmap_invalidate_page(p, v) _pmap_invalidate_page(p, v)
 
-PMAP_INLINE void
-pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva)
+static __inline void
+_pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva)
 {
 	vm_offset_t addr;
 
@@ -848,21 +855,43 @@
 		for (addr = sva; addr < eva; addr += PAGE_SIZE)
 			invlpg(addr);
 }
+void
+pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva)
+{
 
-PMAP_INLINE void
-pmap_invalidate_all(pmap_t pmap)
+	_pmap_invalidate_range(pmap, sva, eva);
+}
+#define pmap_invalidate_range(p, s, e) _pmap_invalidate_range(p, s, e)
+
+static __inline void
+_pmap_invalidate_all(pmap_t pmap)
 {
 
 	if (pmap == kernel_pmap || pmap->pm_active)
 		invltlb();
 }
+void
+pmap_invalidate_all(pmap_t pmap)
+{
+
+	_pmap_invalidate_all(pmap);
+}
+#define pmap_invalidate_all(p) _pmap_invalidate_all(p)
+
 
-PMAP_INLINE void
+static __inline void
+_pmap_invalidate_cache(void)
+{
+
+	wbinvd();
+}
+void
 pmap_invalidate_cache(void)
 {
 
-	wbinvd();
+	pmap_invalidate_cache();
 }
+#define pmap_invalidate_cache() _pmap_invalidate_cache()
 #endif /* !SMP */
 
 /*