From owner-p4-projects@FreeBSD.ORG  Wed Apr  9 19:30:16 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2314737B404; Wed,  9 Apr 2003 19:30:16 -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 C846F37B401
	for <perforce@freebsd.org>; Wed,  9 Apr 2003 19:30:15 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7149443FB1
	for <perforce@freebsd.org>; Wed,  9 Apr 2003 19:30:15 -0700 (PDT)
	(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 h3A2UF0U088578
	for <perforce@freebsd.org>; Wed, 9 Apr 2003 19:30:15 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3A2UFIv088550
	for perforce@freebsd.org; Wed, 9 Apr 2003 19:30:15 -0700 (PDT)
Date: Wed, 9 Apr 2003 19:30:15 -0700 (PDT)
Message-Id: <200304100230.h3A2UFIv088550@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 28679 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: Thu, 10 Apr 2003 02:30:17 -0000

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

Change 28679 by peter@peter_daintree on 2003/04/09 19:29:36

	disable AST processing.  THe frame stuff isn't right.
	fix the interrupt enable state after fork.  Hopefully this will
	fix the startup races I've had.

Affected files ...

.. //depot/projects/hammer/sys/x86_64/x86_64/critical.c#6 edit
.. //depot/projects/hammer/sys/x86_64/x86_64/exception.s#18 edit

Differences ...

==== //depot/projects/hammer/sys/x86_64/x86_64/critical.c#6 (text+ko) ====

@@ -28,7 +28,7 @@
 
 	td = curthread;
 	td->td_critnest = 1;
-	td->td_md.md_savecrit = read_rflags() & PSL_I;
+	td->td_md.md_savecrit = read_rflags() | PSL_I;
 }
 
 /*

==== //depot/projects/hammer/sys/x86_64/x86_64/exception.s#18 (text+ko) ====

@@ -195,9 +195,6 @@
 	movq	%r12, %rdi		/* function */
 	movq	%rbx, %rsi		/* arg1 */
 	movq	%rsp, %rdx		/* trapframe pointer */
-	movq	PCPU(CURTHREAD),%rbx	/* setup critnest */
-	movl	$1,TD_CRITNEST(%rbx)
-	sti				/* enable interrupts */
 	call	fork_exit
 	MEXITCOUNT
 	jmp	doreti			/* Handle any ASTs */
@@ -227,6 +224,7 @@
 	/*
 	 * Check if ASTs can be handled now.
 	 */
+#if 0
 	testb	$SEL_RPL_MASK,TF_CS(%rsp) /* are we returning to user mode? */
 	jz	doreti_exit		/* can't handle ASTs now if not */
 
@@ -253,6 +251,7 @@
 	 *	registers.  The fault is handled in trap.c.
 	 */
 doreti_exit:
+#endif
 	MEXITCOUNT
 
 	popq	%r15