From owner-p4-projects@FreeBSD.ORG  Mon Mar 18 22:07:04 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 304B9BC0; Mon, 18 Mar 2013 22:07:04 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id E5703BBE
 for <perforce@freebsd.org>; Mon, 18 Mar 2013 22:07:03 +0000 (UTC)
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D3B32FF2
 for <perforce@freebsd.org>; Mon, 18 Mar 2013 22:07:03 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r2IM73wr045770
 for <perforce@freebsd.org>; Mon, 18 Mar 2013 22:07:03 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r2IM73ah045767
 for perforce@freebsd.org; Mon, 18 Mar 2013 22:07:03 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 18 Mar 2013 22:07:03 GMT
Message-Id: <201303182207.r2IM73ah045767@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 223026 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Mar 2013 22:07:04 -0000

http://p4web.freebsd.org/@@223026?ac=10

Change 223026 by rwatson@rwatson_cinnamon on 2013/03/18 22:06:24

	Hook up tesla_notification.c to kernel build; remove duplicated
	stub function now that it has been merged upstream (in a different
	spot).

Affected files ...

.. //depot/projects/ctsrd/tesla/src/sys/conf/files#5 edit
.. //depot/projects/ctsrd/tesla/src/sys/libtesla/tesla.h#5 edit

Differences ...

==== //depot/projects/ctsrd/tesla/src/sys/conf/files#5 (text+ko) ====

@@ -2875,6 +2875,7 @@
 libtesla/state-perthread.c	optional tesla
 libtesla/store.c		optional tesla
 libtesla/tesla_dtrace.c		optional tesla kdtrace_hooks
+libtesla/tesla_notification.c	optional tesla
 libtesla/update.c		optional tesla
 libtesla/util.c			optional tesla
 net/bpf.c			standard

==== //depot/projects/ctsrd/tesla/src/sys/libtesla/tesla.h#5 (text+ko) ====

@@ -152,12 +152,6 @@
 #define	__tesla_optional(...)	0
 #define	__tesla_any(...)	0
 
-inline void
-__tesla_inline_assertion(const char *filename, int line, int count,
-    __tesla_locality *loc, ...)
-{
-}
-
 #endif	/* __TESLA_ANALYSER__ */
 
 #endif	/* TESLA_H */