svn commit: r208674 - stable/8/sys/net

[Robert Watson]

Author: rwatson
Date: Mon May 31 21:14:56 2010
New Revision: 208674
URL: http://svn.freebsd.org/changeset/base/208674

Log:
  Merge r200899 from head to stable/8:
  
    When warning about possible netisr configuration problems during boot,
    report using "netisr_init" rather than "netisr2", which was the development
    name for the project.
  
  Approved by:	re (kib)

Modified:
  stable/8/sys/net/netisr.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)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/geom/sched/   (props changed)

Modified: stable/8/sys/net/netisr.c
==============================================================================
--- stable/8/sys/net/netisr.c	Mon May 31 20:17:37 2010	(r208673)
+++ stable/8/sys/net/netisr.c	Mon May 31 21:14:56 2010	(r208674)
@@ -1068,12 +1068,12 @@ netisr_init(void *arg)
 	if (netisr_maxthreads < 1)
 		netisr_maxthreads = 1;
 	if (netisr_maxthreads > mp_ncpus) {
-		printf("netisr2: forcing maxthreads from %d to %d\n",
+		printf("netisr_init: forcing maxthreads from %d to %d\n",
 		    netisr_maxthreads, mp_ncpus);
 		netisr_maxthreads = mp_ncpus;
 	}
 	if (netisr_defaultqlimit > netisr_maxqlimit) {
-		printf("netisr2: forcing defaultqlimit from %d to %d\n",
+		printf("netisr_init: forcing defaultqlimit from %d to %d\n",
 		    netisr_defaultqlimit, netisr_maxqlimit);
 		netisr_defaultqlimit = netisr_maxqlimit;
 	}
@@ -1084,8 +1084,8 @@ netisr_init(void *arg)
 	 * polling disables parallel netisr workers.
 	 */
 	if (netisr_maxthreads != 1 || netisr_bindthreads != 0) {
-		printf("netisr2: forcing maxthreads to 1 and bindthreads to "
-		    "0 for device polling\n");
+		printf("netisr_init: forcing maxthreads to 1 and "
+		    "bindthreads to 0 for device polling\n");
 		netisr_maxthreads = 1;
 		netisr_bindthreads = 0;
 	}