From owner-svn-src-head@FreeBSD.ORG  Sun Jul 20 14:32:36 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 5DF5CA83;
 Sun, 20 Jul 2014 14:32:36 +0000 (UTC)
Received: from fep22.mx.upcmail.net (fep22.mx.upcmail.net [62.179.121.42])
 by mx1.freebsd.org (Postfix) with ESMTP id 3A40D294D;
 Sun, 20 Jul 2014 14:32:34 +0000 (UTC)
Received: from edge04.upcmail.net ([192.168.13.239]) by viefep22-int.chello.at
 (InterMail vM.8.01.05.05 201-2260-151-110-20120111) with ESMTP
 id <20140720143219.SAKX10910.viefep22-int.chello.at@edge04.upcmail.net>;
 Sun, 20 Jul 2014 16:32:19 +0200
Received: from mole.fafoe.narf.at ([80.109.55.137])
 by edge04.upcmail.net with edge
 id UeYK1o00d2xdvHc03eYKuJ; Sun, 20 Jul 2014 16:32:19 +0200
X-SourceIP: 80.109.55.137
Received: by mole.fafoe.narf.at (Postfix, from userid 1001)
 id 26B426D40D; Sun, 20 Jul 2014 16:32:19 +0200 (CEST)
Date: Sun, 20 Jul 2014 16:32:19 +0200
From: Stefan Farfeleder <stefanf@FreeBSD.org>
To: Mark Johnston <markj@FreeBSD.org>
Subject: Re: svn commit: r268869 - in head/sys: amd64/amd64
 cddl/dev/dtrace/amd64 cddl/dev/fbt
Message-ID: <20140720143218.GB1205@mole.fafoe.narf.at>
References: <201407190227.s6J2RWvL042340@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201407190227.s6J2RWvL042340@svn.freebsd.org>
User-Agent: Mutt/1.5.23 (2014-03-12)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
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 14:32:36 -0000

Hi,

On Sat, Jul 19, 2014 at 02:27:32AM +0000, Mark Johnston wrote:
> Author: markj
> Date: Sat Jul 19 02:27:31 2014
> New Revision: 268869
> URL: http://svnweb.freebsd.org/changeset/base/268869

<snip>

> Modified: head/sys/amd64/amd64/trap.c
> ==============================================================================
> --- head/sys/amd64/amd64/trap.c	Sat Jul 19 02:15:28 2014	(r268868)
> +++ head/sys/amd64/amd64/trap.c	Sat Jul 19 02:27:31 2014	(r268869)
> @@ -97,7 +97,8 @@ PMC_SOFT_DEFINE( , , page_fault, write);
>  #include <sys/dtrace_bsd.h>
>  #endif
>  
> -extern void trap(struct trapframe *frame);
> +extern void __noinline trap(struct trapframe *frame);
> +extern void trap_check(struct trapframe *frame);
>  extern void syscall(struct trapframe *frame);
>  void dblfault_handler(struct trapframe *frame);
>  
> @@ -604,6 +605,19 @@ out:
>  	return;
>  }
>  
> +/*
> + * Ensure that we ignore any DTrace-induced faults. This function cannot
> + * be instrumented, so it cannot generate such faults itself.
> + */
> +void
> +trap_check(struct trapframe *frame)
> +{
> +
> +	if (dtrace_trap_func != NULL && (*dtrace_trap_func)(frame))
> +		return;
> +	trap(frame);
> +}
> +
>  static int

/usr/src/sys/amd64/amd64/trap.c:616:6: error: use of undeclared identifier 'dtrace_trap_func'
        if (dtrace_trap_func != NULL && (*dtrace_trap_func)(frame))
            ^

This is without KDTRACE_HOOKS.


BR,
Stefan