svn commit: r305308 - stable/11/sys/arm/ti

[Oleksandr Tymoshenko]

> On Sep 3, 2016, at 1:44 AM, Konstantin Belousov <kostikbel at gmail.com> wrote:
> 
> On Fri, Sep 02, 2016 at 10:04:20PM +0000, Oleksandr Tymoshenko wrote:
>> Author: gonzo
>> Date: Fri Sep  2 22:04:20 2016
>> New Revision: 305308
>> URL: https://svnweb.freebsd.org/changeset/base/305308
>> 
>> Log:
>>  MFC r305039:
>> 
>>  Fix TI PRUSS driver panic with INVARIANTS enabled
>> 
>>  Value passed as islocked argument to knlist_add should
>>  be consistent with actual lock state so add lock/unlock
>>  calls around knlist_add
>> 
>>  PR:		212120
>>  Submitted by:	Manuel Stuhn
>> 
>> Modified:
>>  stable/11/sys/arm/ti/ti_pruss.c
>> Directory Properties:
>>  stable/11/   (props changed)
>> 
>> Modified: stable/11/sys/arm/ti/ti_pruss.c
>> ==============================================================================
>> --- stable/11/sys/arm/ti/ti_pruss.c	Fri Sep  2 21:35:32 2016	(r305307)
>> +++ stable/11/sys/arm/ti/ti_pruss.c	Fri Sep  2 22:04:20 2016	(r305308)
>> @@ -310,7 +310,9 @@ ti_pruss_kqfilter(struct cdev *cdev, str
>> 	case EVFILT_READ:
>> 		kn->kn_hook = sc;
>> 		kn->kn_fop = &ti_pruss_kq_read;
>> +		mtx_lock(&sc->sc_mtx);
>> 		knlist_add(&sc->sc_selinfo.si_note, kn, 1);
>> +		mtx_unlock(&sc->sc_mtx);
>> 		break;
>> 	default:
>> 		return (EINVAL);
> Wouldn't it be less code to just change the arg to indicate 'unlocked’ ?

It would. I’ll update HEAD and stable/11 soon. Thanks for spotting.