From owner-svn-src-stable-8@FreeBSD.ORG Mon May 31 21:14:57 2010 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 31FDF1065674; Mon, 31 May 2010 21:14:57 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 06D948FC16; Mon, 31 May 2010 21:14:57 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o4VLEukY024840; Mon, 31 May 2010 21:14:56 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4VLEup6024838; Mon, 31 May 2010 21:14:56 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <201005312114.o4VLEup6024838@svn.freebsd.org> From: Robert Watson Date: Mon, 31 May 2010 21:14:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r208674 - stable/8/sys/net X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 May 2010 21:14:57 -0000 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; }