From owner-svn-src-all@FreeBSD.ORG  Tue Nov 26 20:27:58 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 176CCCA8;
 Tue, 26 Nov 2013 20:27:58 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 06D982ADC;
 Tue, 26 Nov 2013 20:27:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAQKRvuQ024880;
 Tue, 26 Nov 2013 20:27:57 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAQKRvYi024879;
 Tue, 26 Nov 2013 20:27:57 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201311262027.rAQKRvYi024879@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 26 Nov 2013 20:27:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r258666 - head/sys/fs/nfsclient
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.16
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: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Nov 2013 20:27:58 -0000

Author: glebius
Date: Tue Nov 26 20:27:57 2013
New Revision: 258666
URL: http://svnweb.freebsd.org/changeset/base/258666

Log:
  Fix build, attempt two.

Modified:
  head/sys/fs/nfsclient/nfs_kdtrace.h

Modified: head/sys/fs/nfsclient/nfs_kdtrace.h
==============================================================================
--- head/sys/fs/nfsclient/nfs_kdtrace.h	Tue Nov 26 20:09:43 2013	(r258665)
+++ head/sys/fs/nfsclient/nfs_kdtrace.h	Tue Nov 26 20:27:57 2013	(r258666)
@@ -32,9 +32,6 @@
 #ifndef _NFSCL_NFS_KDTRACE_H_
 #define	_NFSCL_NFS_KDTRACE_H_
 
-#ifdef KDTRACE_HOOKS
-#include <sys/dtrace_bsd.h>
-
 /*
  * Definitions for NFS access cache probes.
  */
@@ -42,6 +39,16 @@ extern uint32_t	nfscl_accesscache_flush_
 extern uint32_t	nfscl_accesscache_get_hit_id;
 extern uint32_t	nfscl_accesscache_get_miss_id;
 extern uint32_t	nfscl_accesscache_load_done_id;
+/*
+ * Definitions for NFS attribute cache probes.
+ */
+extern uint32_t nfscl_attrcache_flush_done_id;
+extern uint32_t nfscl_attrcache_get_hit_id;
+extern uint32_t nfscl_attrcache_get_miss_id;
+extern uint32_t nfscl_attrcache_load_done_id;
+
+#ifdef KDTRACE_HOOKS
+#include <sys/dtrace_bsd.h>
 
 #define	KDTRACE_NFS_ACCESSCACHE_FLUSH_DONE(vp)	do {			\
 	if (dtrace_nfscl_accesscache_flush_done_probe != NULL)		\