From owner-svn-src-user@FreeBSD.ORG  Mon May  9 07:13:09 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 55312106566B;
	Mon,  9 May 2011 07:13:09 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 47F078FC18;
	Mon,  9 May 2011 07:13:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p497D9IM081103;
	Mon, 9 May 2011 07:13:09 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p497D9aH081101;
	Mon, 9 May 2011 07:13:09 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201105090713.p497D9aH081101@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Mon, 9 May 2011 07:13:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r221687 - user/avg/xcpu/sys/amd64/amd64
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 May 2011 07:13:09 -0000

Author: avg
Date: Mon May  9 07:13:08 2011
New Revision: 221687
URL: http://svn.freebsd.org/changeset/base/221687

Log:
  do reset on current CPU if somehow BSP doesn't become active, amd64 only

Modified:
  user/avg/xcpu/sys/amd64/amd64/vm_machdep.c

Modified: user/avg/xcpu/sys/amd64/amd64/vm_machdep.c
==============================================================================
--- user/avg/xcpu/sys/amd64/amd64/vm_machdep.c	Mon May  9 07:11:35 2011	(r221686)
+++ user/avg/xcpu/sys/amd64/amd64/vm_machdep.c	Mon May  9 07:13:08 2011	(r221687)
@@ -550,8 +550,11 @@ cpu_reset()
 			cnt = 0;
 			while (cpu_reset_proxy_active == 0 && cnt < 100000000)
 				cnt++;	/* Wait for BSP to announce restart */
-			if (cpu_reset_proxy_active == 0)
+			if (cpu_reset_proxy_active == 0) {
 				printf("cpu_reset: Failed to restart BSP\n");
+				cpu_reset_real();
+			}
+
 			enable_intr();
 			cpu_reset_proxy_active = 2;