From owner-svn-src-stable@FreeBSD.ORG Sun Nov 6 20:38:02 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AC468106566C; Sun, 6 Nov 2011 20:38:02 +0000 (UTC) (envelope-from marius@alchemy.franken.de) Received: from alchemy.franken.de (alchemy.franken.de [194.94.249.214]) by mx1.freebsd.org (Postfix) with ESMTP id 29EA48FC12; Sun, 6 Nov 2011 20:38:01 +0000 (UTC) Received: from alchemy.franken.de (localhost [127.0.0.1]) by alchemy.franken.de (8.14.4/8.14.4/ALCHEMY.FRANKEN.DE) with ESMTP id pA6Kc0Dl084442; Sun, 6 Nov 2011 21:38:00 +0100 (CET) (envelope-from marius@alchemy.franken.de) Received: (from marius@localhost) by alchemy.franken.de (8.14.4/8.14.4/Submit) id pA6Kc0t0084441; Sun, 6 Nov 2011 21:38:00 +0100 (CET) (envelope-from marius) Date: Sun, 6 Nov 2011 21:38:00 +0100 From: Marius Strobl To: Hans Petter Selasky Message-ID: <20111106203800.GE56603@alchemy.franken.de> References: <201111061513.pA6FD25t027285@svn.freebsd.org> <20111106194743.GD56603@alchemy.franken.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20111106194743.GD56603@alchemy.franken.de> User-Agent: Mutt/1.4.2.3i Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-8@freebsd.org Subject: Re: svn commit: r227217 - stable/8/sys/dev/usb X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2011 20:38:02 -0000 On Sun, Nov 06, 2011 at 08:47:43PM +0100, Marius Strobl wrote: > On Sun, Nov 06, 2011 at 03:13:02PM +0000, Hans Petter Selasky wrote: > > Author: hselasky > > Date: Sun Nov 6 15:13:01 2011 > > New Revision: 227217 > > URL: http://svn.freebsd.org/changeset/base/227217 > > > > Log: > > MFC r227075: > > Fix for panic at USB controller attach failure during cold boot. > > > > Modified: > > stable/8/sys/dev/usb/usb_process.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/dev/usb/usb_process.c > > ============================================================================== > > --- stable/8/sys/dev/usb/usb_process.c Sun Nov 6 15:06:04 2011 (r227216) > > +++ stable/8/sys/dev/usb/usb_process.c Sun Nov 6 15:13:01 2011 (r227217) > > @@ -67,11 +67,13 @@ static int usb_pcount; > > #define USB_THREAD_CREATE(f, s, p, ...) \ > > kproc_kthread_add((f), (s), &usbproc, (p), RFHIGHPID, \ > > 0, "usb", __VA_ARGS__) > > +#define USB_THREAD_SUSPEND_CHECK() kthread_suspend_check() > > In stable/8 kthread_suspend_check(9) takes an struct thread * argument. > Sorry, I didn't look closely enough, it probably should use the same approach as hptmv(4): #if (__FreeBSD_version >= 800002) kproc_suspend_check(curproc); #elif (__FreeBSD_version >= 500043) kthread_suspend_check(curproc); #else kproc_suspend_loop(curproc); #endif In any case, r227217 broke kernel compilation of stable/8. Marius