From owner-svn-src-head@FreeBSD.ORG  Sun Jul 20 18:46:49 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 64106CE6;
 Sun, 20 Jul 2014 18:46:49 +0000 (UTC)
Received: from mail-ie0-x231.google.com (mail-ie0-x231.google.com
 [IPv6:2607:f8b0:4001:c03::231])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 1358F2FC0;
 Sun, 20 Jul 2014 18:46:49 +0000 (UTC)
Received: by mail-ie0-f177.google.com with SMTP id at20so6093142iec.22
 for <multiple recipients>; Sun, 20 Jul 2014 11:46:48 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=sender:date:from:to:cc:subject:message-id:references:mime-version
 :content-type:content-disposition:in-reply-to:user-agent;
 bh=xXtPBjLuXEAs+jGiwQlVwO2cKhzeb2NO9Gz3SaLBUgE=;
 b=kgXl0nfxL3yNF+PEG8n+Aymgha1ONHThFsWZHWuQLJexTxeD/VV1OrQyU6n+VwsHXn
 1iVkO32gr9u+AkPcXVU7M7pX1XLNmq6leeQM34Suoe/cjxbzrYUsDuHKBGUGm6QzeGGi
 ltsVBXujmdcRCkTswTpJisDD7QMVKjEhGf25WgAjD/euMT89Nlk5xYExHy09OOGZ9V0L
 dbNN4JzPPVPzJifxvDkoYH01DyQD6nRwEeCe8ozEHbwN5vA6kqzYjBEEtWYv53wJgVNj
 4GbUnYzh6v7o8KJbgr1hLpyORVPd4gxaDaIu2yPUJ0+Kp/aDCFi+rtnqEzI9Ey6ilYJk
 eugw==
X-Received: by 10.50.66.179 with SMTP id g19mr34511651igt.29.1405882008070;
 Sun, 20 Jul 2014 11:46:48 -0700 (PDT)
Received: from charmander.home ([65.92.195.187])
 by mx.google.com with ESMTPSA id ro10sm30614110igb.18.2014.07.20.11.46.47
 for <multiple recipients>
 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
 Sun, 20 Jul 2014 11:46:47 -0700 (PDT)
Sender: Mark Johnston <markjdb@gmail.com>
Date: Sun, 20 Jul 2014 14:46:11 -0400
From: Mark Johnston <markj@FreeBSD.org>
To: Stefan Farfeleder <stefanf@FreeBSD.org>
Subject: Re: svn commit: r268869 - in head/sys: amd64/amd64
 cddl/dev/dtrace/amd64 cddl/dev/fbt
Message-ID: <20140720184610.GA1321@charmander.home>
References: <201407190227.s6J2RWvL042340@svn.freebsd.org>
 <20140720143218.GB1205@mole.fafoe.narf.at>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20140720143218.GB1205@mole.fafoe.narf.at>
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 18:46:49 -0000

On Sun, Jul 20, 2014 at 04:32:19PM +0200, Stefan Farfeleder wrote:
> 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.

Sorry about that. This is fixed in r268923.

-Mark