From owner-svn-src-all@freebsd.org  Fri Sep  2 22:04:21 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CB4E3BCC302;
 Fri,  2 Sep 2016 22:04:21 +0000 (UTC)
 (envelope-from gonzo@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8B515362;
 Fri,  2 Sep 2016 22:04:21 +0000 (UTC)
 (envelope-from gonzo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u82M4K27025954;
 Fri, 2 Sep 2016 22:04:20 GMT (envelope-from gonzo@FreeBSD.org)
Received: (from gonzo@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u82M4KOm025953;
 Fri, 2 Sep 2016 22:04:20 GMT (envelope-from gonzo@FreeBSD.org)
Message-Id: <201609022204.u82M4KOm025953@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gonzo set sender to
 gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Fri, 2 Sep 2016 22:04:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r305308 - stable/11/sys/arm/ti
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Sep 2016 22:04:21 -0000

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);