From owner-p4-projects@FreeBSD.ORG  Wed Nov 10 23:27:18 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8A14316A4D0; Wed, 10 Nov 2004 23:27:18 +0000 (GMT)
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 66A0A16A4CE
	for <perforce@freebsd.org>; Wed, 10 Nov 2004 23:27:18 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 575B343D39
	for <perforce@freebsd.org>; Wed, 10 Nov 2004 23:27:18 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAANRIuR056828
	for <perforce@freebsd.org>; Wed, 10 Nov 2004 23:27:18 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAANRIUk056825
	for perforce@freebsd.org; Wed, 10 Nov 2004 23:27:18 GMT
	(envelope-from peter@freebsd.org)
Date: Wed, 10 Nov 2004 23:27:18 GMT
Message-Id: <200411102327.iAANRIUk056825@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 64850 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 Nov 2004 23:27:19 -0000

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

Change 64850 by peter@peter_daintree on 2004/11/10 23:26:58

	kill cpu_reset_proxy stuff, sched_bind() to cpu0 does
	it better.

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#52 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#52 (text+ko) ====

@@ -80,11 +80,6 @@
 #include <amd64/isa/isa.h>
 
 static void	cpu_reset_real(void);
-#ifdef SMP
-static void	cpu_reset_proxy(void);
-static u_int	cpu_reset_proxyid;
-static volatile u_int	cpu_reset_proxy_active;
-#endif
 
 /*
  * Finish a fork operation, with process p2 nearly set up.
@@ -332,22 +327,6 @@
 /*
  * Force reset the processor by invalidating the entire address space!
  */
-
-#ifdef SMP
-static void
-cpu_reset_proxy()
-{
-
-	cpu_reset_proxy_active = 1;
-	while (cpu_reset_proxy_active == 1)
-		;	 /* Wait for other cpu to see that we've started */
-	stop_cpus((1<<cpu_reset_proxyid));
-	printf("cpu_reset_proxy: Stopped CPU %d\n", cpu_reset_proxyid);
-	DELAY(1000000);
-	cpu_reset_real();
-}
-#endif
-
 void
 cpu_reset()
 {
@@ -368,30 +347,9 @@
 			stop_cpus(map);		/* Stop all other CPUs */
 		}
 
-		if (PCPU_GET(cpuid) == 0) {
-			DELAY(1000000);
-			cpu_reset_real();
-			/* NOTREACHED */
-		} else {
-			/* We are not BSP (CPU #0) */
-
-			cpu_reset_proxyid = PCPU_GET(cpuid);
-			cpustop_restartfunc = cpu_reset_proxy;
-			cpu_reset_proxy_active = 0;
-			printf("cpu_reset: Restarting BSP\n");
-			started_cpus = (1<<0);		/* Restart CPU #0 */
-
-			cnt = 0;
-			while (cpu_reset_proxy_active == 0 && cnt < 10000000)
-				cnt++;	/* Wait for BSP to announce restart */
-			if (cpu_reset_proxy_active == 0)
-				printf("cpu_reset: Failed to restart BSP\n");
-			enable_intr();
-			cpu_reset_proxy_active = 2;
-
-			while (1);
-			/* NOTREACHED */
-		}
+		DELAY(1000000);
+		cpu_reset_real();
+		/* NOTREACHED */
 	}
 #else
 	cpu_reset_real();