svn commit: r261906 - head/sys/kern

[Adrian Chadd]

Author: adrian
Date: Fri Feb 14 23:19:51 2014
New Revision: 261906
URL: http://svnweb.freebsd.org/changeset/base/261906

Log:
  Include the CPU id in the per-CPU timer swi thread descriptions.
  
  Original patch by:	jhb

Modified:
  head/sys/kern/kern_timeout.c

Modified: head/sys/kern/kern_timeout.c
==============================================================================
--- head/sys/kern/kern_timeout.c	Fri Feb 14 21:46:04 2014	(r261905)
+++ head/sys/kern/kern_timeout.c	Fri Feb 14 23:19:51 2014	(r261906)
@@ -352,12 +352,14 @@ static void
 start_softclock(void *dummy)
 {
 	struct callout_cpu *cc;
+	char name[MAXCOMLEN];
 #ifdef SMP
 	int cpu;
 #endif
 
 	cc = CC_CPU(timeout_cpu);
-	if (swi_add(&clk_intr_event, "clock", softclock, cc, SWI_CLOCK,
+	snprintf(name, sizeof(name), "clock (%d)", timeout_cpu);
+	if (swi_add(&clk_intr_event, name, softclock, cc, SWI_CLOCK,
 	    INTR_MPSAFE, &cc->cc_cookie))
 		panic("died while creating standard software ithreads");
 #ifdef SMP
@@ -367,7 +369,8 @@ start_softclock(void *dummy)
 		cc = CC_CPU(cpu);
 		cc->cc_callout = NULL;	/* Only cpu0 handles timeout(9). */
 		callout_cpu_init(cc);
-		if (swi_add(NULL, "clock", softclock, cc, SWI_CLOCK,
+		snprintf(name, sizeof(name), "clock (%d)", cpu);
+		if (swi_add(NULL, name, softclock, cc, SWI_CLOCK,
 		    INTR_MPSAFE, &cc->cc_cookie))
 			panic("died while creating standard software ithreads");
 	}