svn commit: r221687 - user/avg/xcpu/sys/amd64/amd64

[Andriy Gapon]

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;