svn commit: r225581 - stable/8/sys/kern

[Andriy Gapon]

Author: avg
Date: Thu Sep 15 11:17:07 2011
New Revision: 225581
URL: http://svn.freebsd.org/changeset/base/225581

Log:
  MFC r223530: generic_stop_cpus: pull timeout logic from under DIAGNOSTIC

Modified:
  stable/8/sys/kern/subr_smp.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/kern/subr_smp.c
==============================================================================
--- stable/8/sys/kern/subr_smp.c	Thu Sep 15 10:51:31 2011	(r225580)
+++ stable/8/sys/kern/subr_smp.c	Thu Sep 15 11:17:07 2011	(r225581)
@@ -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;