From owner-p4-projects@FreeBSD.ORG  Thu Apr 17 11:38:02 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3FE3837B401; Thu, 17 Apr 2003 11:38:01 -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 BD59537B40E
	for <perforce@freebsd.org>; Thu, 17 Apr 2003 11:38:00 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6476843FBD
	for <perforce@freebsd.org>; Thu, 17 Apr 2003 11:38:00 -0700 (PDT)
	(envelope-from marcel@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 h3HIc00U050715
	for <perforce@freebsd.org>; Thu, 17 Apr 2003 11:38:00 -0700 (PDT)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3HIbxGH050712
	for perforce@freebsd.org; Thu, 17 Apr 2003 11:37:59 -0700 (PDT)
Date: Thu, 17 Apr 2003 11:37:59 -0700 (PDT)
Message-Id: <200304171837.h3HIbxGH050712@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 29140 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, 17 Apr 2003 18:38:02 -0000

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

Change 29140 by marcel@marcel_nfs on 2003/04/17 11:37:51

	When we switch to virtual addressing on the AP, enable
	interrupt collection as well. This avoids nested TLB
	faults in cases we have to deal with a fault. There's
	also no need to keep interrupt collection disabled.

Affected files ...

.. //depot/projects/ia64_epc/sys/ia64/ia64/locore.s#11 edit
.. //depot/projects/ia64_epc/sys/ia64/ia64/mp_machdep.c#7 edit

Differences ...

==== //depot/projects/ia64_epc/sys/ia64/ia64/locore.s#11 (text+ko) ====

@@ -282,7 +282,7 @@
 	;;
 1:	mov	r16 = ip
 	add	r17 = 2f-1b, r17
-	movl	r18 = (IA64_PSR_AC|IA64_PSR_BN|IA64_PSR_DFH|IA64_PSR_DT|IA64_PSR_IT|IA64_PSR_RT)
+	movl	r18 = (IA64_PSR_AC|IA64_PSR_BN|IA64_PSR_DFH|IA64_PSR_DT|IA64_PSR_IC|IA64_PSR_IT|IA64_PSR_RT)
 	;;
 	add	r17 = r17, r16
 	mov	cr.ipsr = r18

==== //depot/projects/ia64_epc/sys/ia64/ia64/mp_machdep.c#7 (text+ko) ====

@@ -104,7 +104,7 @@
 	while (ap_spin)
 		/* spin */;
 
-	__asm __volatile("ssm psr.ic|psr.i;; srlz.i;;");
+	__asm __volatile("ssm psr.i;; srlz.d;;");
 
 	/*
 	 * Get and save the CPU specific MCA records. Should we get the