svn commit: r190106 - head/sys/sparc64/sparc64

[Marius Strobl]

Author: marius
Date: Thu Mar 19 20:43:01 2009
New Revision: 190106
URL: http://svn.freebsd.org/changeset/base/190106

Log:
  - Remove the delay in cpu_mp_shutdown() which is no longer necessary since
    we have stopped using SUNW,stop-self with r186395.
  - There's no need to wrap kdb_active in #ifdef KDB as it's always available.

Modified:
  head/sys/sparc64/sparc64/mp_machdep.c

Modified: head/sys/sparc64/sparc64/mp_machdep.c
==============================================================================
--- head/sys/sparc64/sparc64/mp_machdep.c	Thu Mar 19 20:40:49 2009	(r190105)
+++ head/sys/sparc64/sparc64/mp_machdep.c	Thu Mar 19 20:43:01 2009	(r190106)
@@ -413,8 +413,6 @@ cpu_mp_shutdown(void)
 			break;
 		}
 	}
-	/* XXX: delay a bit to allow the CPUs to actually enter the PROM. */
-	DELAY(100000);
 	critical_exit();
 }
 
@@ -505,11 +503,7 @@ spitfire_ipi_send(u_int mid, u_long d0, 
 		 */
 		DELAY(2);
 	}
-	if (
-#ifdef KDB
-	    kdb_active ||
-#endif
-	    panicstr != NULL)
+	if (kdb_active != 0 || panicstr != NULL)
 		printf("%s: couldn't send IPI to module 0x%u\n",
 		    __func__, mid);
 	else
@@ -581,11 +575,7 @@ cheetah_ipi_selected(u_int cpus, u_long 
 		 */
 		DELAY(2 * mp_ncpus);
 	}
-	if (
-#ifdef KDB
-	    kdb_active ||
-#endif
-	    panicstr != NULL)
+	if (kdb_active != 0 || panicstr != NULL)
 		printf("%s: couldn't send IPI (cpus=0x%u ids=0x%lu)\n",
 		    __func__, cpus, ids);
 	else