From owner-svn-src-head@freebsd.org Tue May 24 21:13:34 2016 Return-Path: Delivered-To: svn-src-head@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 AB745B49FFD; Tue, 24 May 2016 21:13:34 +0000 (UTC) (envelope-from kib@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 7C065164C; Tue, 24 May 2016 21:13:34 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4OLDX3S036156; Tue, 24 May 2016 21:13:33 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4OLDXao036155; Tue, 24 May 2016 21:13:33 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201605242113.u4OLDXao036155@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Tue, 24 May 2016 21:13:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r300627 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 May 2016 21:13:34 -0000 Author: kib Date: Tue May 24 21:13:33 2016 New Revision: 300627 URL: https://svnweb.freebsd.org/changeset/base/300627 Log: Silence false LOR report due to the taskqueue mutex and kqueue lock named the same. Reported by: Doug Luce Sponsored by: The FreeBSD Foundation Modified: head/sys/kern/kern_event.c Modified: head/sys/kern/kern_event.c ============================================================================== --- head/sys/kern/kern_event.c Tue May 24 21:09:05 2016 (r300626) +++ head/sys/kern/kern_event.c Tue May 24 21:13:33 2016 (r300627) @@ -91,7 +91,7 @@ MTX_SYSINIT(kq_global, &kq_global, "kque haslck = 0; \ } while (0) -TASKQUEUE_DEFINE_THREAD(kqueue); +TASKQUEUE_DEFINE_THREAD(kqueue_ctx); static int kevent_copyout(void *arg, struct kevent *kevp, int count); static int kevent_copyin(void *arg, struct kevent *kevp, int count); @@ -1426,7 +1426,7 @@ kqueue_schedtask(struct kqueue *kq) ("scheduling kqueue task while draining")); if ((kq->kq_state & KQ_TASKSCHED) != KQ_TASKSCHED) { - taskqueue_enqueue(taskqueue_kqueue, &kq->kq_task); + taskqueue_enqueue(taskqueue_kqueue_ctx, &kq->kq_task); kq->kq_state |= KQ_TASKSCHED; } }