svn commit: r221676 - user/avg/xcpu/sys/kern

[Andriy Gapon]

Author: avg
Date: Mon May  9 07:04:14 2011
New Revision: 221676
URL: http://svn.freebsd.org/changeset/base/221676

Log:
  generic_stop_cpus: move timeout detection code from under DIAGNOSTIC
  
  ... and also increase it a bit.
  IMO it's better to detect and report the (rather serious) condition and
  allow a system to proceed somehow rather than be stuck in an endless
  loop.

Modified:
  user/avg/xcpu/sys/kern/subr_smp.c

Modified: user/avg/xcpu/sys/kern/subr_smp.c
==============================================================================
--- user/avg/xcpu/sys/kern/subr_smp.c	Mon May  9 07:03:01 2011	(r221675)
+++ user/avg/xcpu/sys/kern/subr_smp.c	Mon May  9 07:04:14 2011	(r221676)
@@ -232,12 +232,10 @@ generic_stop_cpus(cpumask_t map, u_int t
 		/* spin */
 		cpu_spinwait();
 		i++;
-#ifdef DIAGNOSTIC
-		if (i == 100000) {
+		if (i == 100000000) {
 			printf("timeout stopping cpus\n");
 			break;
 		}
-#endif
 	}
 
 	stopping_cpu = NOCPU;