From owner-p4-projects@FreeBSD.ORG  Wed Dec 10 13:32:17 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 819A716A4D0; Wed, 10 Dec 2003 13:32:17 -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 5B37316A4CE
	for <perforce@freebsd.org>; Wed, 10 Dec 2003 13:32:17 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 357B043D09
	for <perforce@freebsd.org>; Wed, 10 Dec 2003 13:32:11 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hBALWBXJ039138
	for <perforce@freebsd.org>; Wed, 10 Dec 2003 13:32:11 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hBALWAhT039135
	for perforce@freebsd.org; Wed, 10 Dec 2003 13:32:10 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Wed, 10 Dec 2003 13:32:10 -0800 (PST)
Message-Id: <200312102132.hBALWAhT039135@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 43765 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: Wed, 10 Dec 2003 21:32:18 -0000

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

Change 43765 by peter@peter_daintree on 2003/12/10 13:31:49

	dont do a NOP address space change, in case the TLB flush filter
	was disabled.  Also, add a placeholder for the address space borrowing.

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#16 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#16 (text+ko) ====

@@ -169,12 +169,19 @@
 	jz	badsw3				/* no, panic */
 #endif
 	movq	TD_PCB(%rsi),%r8
-	movl	PCPU(CPUID), %eax
 
 	/* switch address space */
 	movq	PCB_CR3(%r8),%rdx
+#ifdef LAZY_SWITCH
+	cmpq	%rdx,KPML4phys			/* Kernel address space? */
+	je	sw1
+#endif
+	movq	%cr3,%rax
+	cmpq	%rdx,%rax			/* Same address space? */
+	je	sw1
 	movq	%rdx,%cr3			/* new address space */
 
+	movl	PCPU(CPUID), %eax
 	/* Release bit from old pmap->pm_active */
 	movq	TD_PROC(%rdi), %rdx		/* oldproc */
 	movq	P_VMSPACE(%rdx), %rdx