From owner-svn-src-all@freebsd.org Mon Jun 27 23:34:54 2016 Return-Path: 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 A184EB81609; Mon, 27 Jun 2016 23:34:54 +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 731B62BBF; Mon, 27 Jun 2016 23:34:54 +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 u5RNYrpP069390; Mon, 27 Jun 2016 23:34:53 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5RNYrAG069388; Mon, 27 Jun 2016 23:34:53 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201606272334.u5RNYrAG069388@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Mon, 27 Jun 2016 23:34:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r302242 - in head/sys: kern sys X-SVN-Group: head 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Jun 2016 23:34:54 -0000 Author: kib Date: Mon Jun 27 23:34:53 2016 New Revision: 302242 URL: https://svnweb.freebsd.org/changeset/base/302242 Log: Fix userspace build after r302235: do not expose bool field of the structure, change it to int. The real fix is to sanitize user-visible definitions in sys/event.h, e.g. the affected struct knlist is of no use for userspace programs. Reported and tested by: jkim Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Approved by: re (gjb) Modified: head/sys/kern/kern_event.c head/sys/sys/event.h Modified: head/sys/kern/kern_event.c ============================================================================== --- head/sys/kern/kern_event.c Mon Jun 27 22:21:29 2016 (r302241) +++ head/sys/kern/kern_event.c Mon Jun 27 23:34:53 2016 (r302242) @@ -2204,7 +2204,7 @@ knlist_init(struct knlist *knl, void *lo else knl->kl_assert_unlocked = kl_assert_unlocked; - knl->kl_autodestroy = false; + knl->kl_autodestroy = 0; SLIST_INIT(&knl->kl_list); } @@ -2255,7 +2255,7 @@ knlist_detach(struct knlist *knl) { KNL_ASSERT_LOCKED(knl); - knl->kl_autodestroy = true; + knl->kl_autodestroy = 1; if (knlist_empty(knl)) { knlist_destroy(knl); free(knl, M_KQUEUE); Modified: head/sys/sys/event.h ============================================================================== --- head/sys/sys/event.h Mon Jun 27 22:21:29 2016 (r302241) +++ head/sys/sys/event.h Mon Jun 27 23:34:53 2016 (r302242) @@ -159,7 +159,7 @@ struct knlist { void (*kl_assert_locked)(void *); void (*kl_assert_unlocked)(void *); void *kl_lockarg; /* argument passed to lock functions */ - bool kl_autodestroy; + int kl_autodestroy; };