From owner-p4-projects@FreeBSD.ORG  Sun Jul  1 02:26:44 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 DC8F116A421; Sun,  1 Jul 2007 02:26:43 +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 5F66116A41F
	for <perforce@freebsd.org>; Sun,  1 Jul 2007 02:26:43 +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 4F54C13C455
	for <perforce@freebsd.org>; Sun,  1 Jul 2007 02:26:43 +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 l612Qhko036380
	for <perforce@freebsd.org>; Sun, 1 Jul 2007 02:26:43 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l612QhKS036376
	for perforce@freebsd.org; Sun, 1 Jul 2007 02:26:43 GMT
	(envelope-from peter@freebsd.org)
Date: Sun, 1 Jul 2007 02:26:43 GMT
Message-Id: <200707010226.l612QhKS036376@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 122604 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 02:26:44 -0000

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

Change 122604 by peter@peter_melody on 2007/07/01 02:26:23

	Quiet some gcc-4.2 warnings

Affected files ...

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

Differences ...

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

@@ -379,13 +379,20 @@
 }
 
 
-PMAP_INLINE pt_entry_t *
-vtopte(vm_offset_t va)
+static __inline pt_entry_t *
+_vtopte(vm_offset_t va)
 {
 	u_int64_t mask = ((1ul << (NPTEPGSHIFT + NPDEPGSHIFT + NPDPEPGSHIFT + NPML4EPGSHIFT)) - 1);
 
 	return (PTmap + ((va >> PAGE_SHIFT) & mask));
 }
+pt_entry_t *
+vtopte(vm_offset_t va)
+{
+	
+	return (_vtopte(va));
+}
+#define vtopte(v) _vtopte(v)
 
 static __inline pd_entry_t *
 vtopde(vm_offset_t va)
@@ -967,7 +974,7 @@
  * Add a wired page to the kva.
  * Note: not SMP coherent.
  */
-PMAP_INLINE void 
+void 
 pmap_kenter(vm_offset_t va, vm_paddr_t pa)
 {
 	pt_entry_t *pte;
@@ -976,7 +983,7 @@
 	pte_store(pte, pa | PG_RW | PG_V | PG_G);
 }
 
-PMAP_INLINE void 
+void 
 pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, int mode)
 {
 	pt_entry_t *pte;
@@ -989,7 +996,7 @@
  * Remove a page from the kernel pagetables.
  * Note: not SMP coherent.
  */
-PMAP_INLINE void
+void
 pmap_kremove(vm_offset_t va)
 {
 	pt_entry_t *pte;
@@ -1054,10 +1061,12 @@
 pmap_qremove(vm_offset_t sva, int count)
 {
 	vm_offset_t va;
+	pt_entry_t *pte;
 
 	va = sva;
 	while (count-- > 0) {
-		pmap_kremove(va);
+		pte = vtopte(va);
+		pte_clear(pte);
 		va += PAGE_SIZE;
 	}
 	pmap_invalidate_range(kernel_pmap, sva, va);