From owner-svn-src-user@FreeBSD.ORG Fri Apr 17 00:11:00 2015 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 399D79B7; Fri, 17 Apr 2015 00:11:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 24400D0A; Fri, 17 Apr 2015 00:11:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3H0B0DM072565; Fri, 17 Apr 2015 00:11:00 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3H0B0Fh072554; Fri, 17 Apr 2015 00:11:00 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201504170011.t3H0B0Fh072554@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Fri, 17 Apr 2015 00:10:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281632 - user/delphij/zfs-arc-rebase/sys/cddl/compat/opensolaris/sys X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Apr 2015 00:11:00 -0000 Author: delphij Date: Fri Apr 17 00:10:59 2015 New Revision: 281632 URL: https://svnweb.freebsd.org/changeset/base/281632 Log: ks_update has to be defined outside _KERNEL scope, otherwise code that assigns it would have to protect the assignment inside #ifdef _KERNEL. Modified: user/delphij/zfs-arc-rebase/sys/cddl/compat/opensolaris/sys/kstat.h Modified: user/delphij/zfs-arc-rebase/sys/cddl/compat/opensolaris/sys/kstat.h ============================================================================== --- user/delphij/zfs-arc-rebase/sys/cddl/compat/opensolaris/sys/kstat.h Fri Apr 17 00:05:34 2015 (r281631) +++ user/delphij/zfs-arc-rebase/sys/cddl/compat/opensolaris/sys/kstat.h Fri Apr 17 00:10:59 2015 (r281632) @@ -41,8 +41,8 @@ typedef struct kstat { void *ks_data; u_int ks_ndata; -#ifdef _KERNEL int (*ks_update)(struct kstat *, int); /* dynamic update callback */ +#ifdef _KERNEL struct sysctl_ctx_list ks_sysctl_ctx; struct sysctl_oid *ks_sysctl_root; #endif