From owner-svn-src-head@FreeBSD.ORG  Sun Jul 20 18:44:57 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 3CF4EB97;
 Sun, 20 Jul 2014 18:44:57 +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 2A52F2FAF;
 Sun, 20 Jul 2014 18:44:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6KIivfG004207;
 Sun, 20 Jul 2014 18:44:57 GMT (envelope-from markj@svn.freebsd.org)
Received: (from markj@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6KIiv31004206;
 Sun, 20 Jul 2014 18:44:57 GMT (envelope-from markj@svn.freebsd.org)
Message-Id: <201407201844.s6KIiv31004206@svn.freebsd.org>
From: Mark Johnston <markj@FreeBSD.org>
Date: Sun, 20 Jul 2014 18:44:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r268923 - head/sys/amd64/amd64
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.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Jul 2014 18:44:57 -0000

Author: markj
Date: Sun Jul 20 18:44:56 2014
New Revision: 268923
URL: http://svnweb.freebsd.org/changeset/base/268923

Log:
  Fix the build when DTrace isn't enabled.
  
  Reported by:	stefanf
  X-MFC-With:	r268600

Modified:
  head/sys/amd64/amd64/trap.c

Modified: head/sys/amd64/amd64/trap.c
==============================================================================
--- head/sys/amd64/amd64/trap.c	Sun Jul 20 16:34:35 2014	(r268922)
+++ head/sys/amd64/amd64/trap.c	Sun Jul 20 18:44:56 2014	(r268923)
@@ -613,8 +613,10 @@ void
 trap_check(struct trapframe *frame)
 {
 
+#ifdef KDTRACE_HOOKS
 	if (dtrace_trap_func != NULL && (*dtrace_trap_func)(frame))
 		return;
+#endif
 	trap(frame);
 }