From owner-p4-projects  Fri Jul 12  1:28: 7 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0D0AF37B405; Fri, 12 Jul 2002 01:27:54 -0700 (PDT)
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 A5EE837B400
	for <perforce@freebsd.org>; Fri, 12 Jul 2002 01:27:53 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 69AA543E31
	for <perforce@freebsd.org>; Fri, 12 Jul 2002 01:27:53 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6C8RrJU059016
	for <perforce@freebsd.org>; Fri, 12 Jul 2002 01:27:53 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6C8RrFo059013
	for perforce@freebsd.org; Fri, 12 Jul 2002 01:27:53 -0700 (PDT)
Date: Fri, 12 Jul 2002 01:27:53 -0700 (PDT)
Message-Id: <200207120827.g6C8RrFo059013@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
Subject: PERFORCE change 14135 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14135

Change 14135 by peter@peter_daintree on 2002/07/12 01:27:33

	repair merge-o-tron glitches

Affected files ...

.. //depot/projects/pmap/sys/i386/i386/pmap.c#25 edit

Differences ...

==== //depot/projects/pmap/sys/i386/i386/pmap.c#25 (text+ko) ====

@@ -591,17 +591,7 @@
 	if (pmap == kernel_pmap || pmap->pm_active)
 		invltlb();
 }
-#endif
 
-#ifdef SMP
-void
-pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva)
-{
-	u_int cpumask;
-	u_int other_cpus;
-	struct thread *td;
-	vm_offset_t addr;
-
 PMAP_INLINE void
 pmap_invalidate_all(pmap_t pmap)
 {
@@ -717,7 +707,6 @@
 		for (addr = sva; addr < eva; addr += PAGE_SIZE)
 			invlpg(addr);
 }
-#endif
 
 PMAP_INLINE void
 pmap_invalidate_all(pmap_t pmap)

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message