svn commit: r227217 - stable/8/sys/dev/usb

[Hans Petter Selasky]

On Sunday 06 November 2011 21:38:00 Marius Strobl wrote:
> 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.

Hi,

I'll fix this ASAP. Sorry for the inconvenience.

--HPS