svn commit: r313855 - head/sys/kern

[Mateusz Guzik]

On Fri, Feb 17, 2017 at 11:55:36AM +0100, Michal Meloun wrote:
> 
> 
> On 17.02.2017 6:39, Mateusz Guzik wrote:
> > Modified: head/sys/kern/kern_sx.c
> > ==============================================================================
> > --- head/sys/kern/kern_sx.c	Fri Feb 17 05:22:58 2017	(r313854)
> > +++ head/sys/kern/kern_sx.c	Fri Feb 17 05:39:40 2017	(r313855)
> > @@ -364,7 +364,11 @@ _sx_xunlock(struct sx *sx, const char *f
> >  	WITNESS_UNLOCK(&sx->lock_object, LOP_EXCLUSIVE, file, line);
> >  	LOCK_LOG_LOCK("XUNLOCK", &sx->lock_object, 0, sx->sx_recurse, file,
> >  	    line);
> > +#ifdef LOCK_PROFILING
> >  	_sx_xunlock_hard(sx, (uintptr_t)curthread, file, line);
> > +#else
> > +	__sx_xunlock(sx, curthread, file, line);
> > +#endif
> >  	TD_LOCKS_DEC(curthread);
> >  }
> >  
> > 
> 
> This breaks armv6 kernel.
> Michal
> 
> 
> /usr2/Meloun/git/tegra/sys/kern/kern_sx.c:370:2: error: implicit
> declaration of function '__sx_xunlock' is invalid in C99
>       [-Werror,-Wimplicit-function-declaration]
>         __sx_xunlock(sx, curthread, file, line);
>         ^
> /usr2/Meloun/git/tegra/sys/kern/kern_sx.c:370:2: note: did you mean
> '_sx_xunlock'?
> /usr2/Meloun/git/tegra/sys/kern/kern_sx.c:358:1: note: '_sx_xunlock'
> declared here
> _sx_xunlock(struct sx *sx, const char *file, int line)
> ^
> 1 error generated.
> 

Should work with r313865.

-- 
Mateusz Guzik <mjguzik gmail.com>