From owner-p4-projects@FreeBSD.ORG  Thu Apr 20 16:14:42 2006
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 5842916A405; Thu, 20 Apr 2006 16:14:42 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 11BA416A401
	for <perforce@freebsd.org>; Thu, 20 Apr 2006 16:14:42 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1863943D68
	for <perforce@freebsd.org>; Thu, 20 Apr 2006 16:14:38 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3KGEbX5012506
	for <perforce@freebsd.org>; Thu, 20 Apr 2006 16:14:37 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3KGEbum012503
	for perforce@freebsd.org; Thu, 20 Apr 2006 16:14:37 GMT
	(envelope-from jhb@freebsd.org)
Date: Thu, 20 Apr 2006 16:14:37 GMT
Message-Id: <200604201614.k3KGEbum012503@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 95694 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: Thu, 20 Apr 2006 16:14:42 -0000

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

Change 95694 by jhb@jhb_slimer on 2006/04/20 16:14:36

	Disable interrupts during the CPU shutdown to avoid problems
	with lapic timer interrupt blocking on sched_lock owned by a
	CPU that has been stopped.

Affected files ...

.. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#32 edit
.. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#77 edit

Differences ...

==== //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#32 (text+ko) ====

@@ -361,6 +361,7 @@
 cpu_reset_proxy()
 {
 
+	disable_intr();
 	cpu_reset_proxy_active = 1;
 	while (cpu_reset_proxy_active == 1)
 		;	/* Wait for other cpu to see that we've started */
@@ -377,6 +378,7 @@
 #ifdef SMP
 	u_int cnt, map;
 
+	disable_intr();
 	if (smp_active) {
 		map = PCPU_GET(other_cpus) & ~stopped_cpus;
 		if (map != 0) {

==== //depot/projects/smpng/sys/i386/i386/vm_machdep.c#77 (text+ko) ====

@@ -526,6 +526,7 @@
 cpu_reset_proxy()
 {
 
+	disable_intr();
 	cpu_reset_proxy_active = 1;
 	while (cpu_reset_proxy_active == 1)
 		;	/* Wait for other cpu to see that we've started */
@@ -550,6 +551,7 @@
 #ifdef SMP
 	u_int cnt, map;
 
+	disable_intr();
 	if (smp_active) {
 		map = PCPU_GET(other_cpus) & ~stopped_cpus;
 		if (map != 0) {