From owner-p4-projects@FreeBSD.ORG  Mon Jul 22 22:36:47 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id D4759FBE; Mon, 22 Jul 2013 22:36:47 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 4FD55FBC
 for <perforce@freebsd.org>; Mon, 22 Jul 2013 22:36:47 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74])
 (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 2432D28AA
 for <perforce@freebsd.org>; Mon, 22 Jul 2013 22:36:47 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6MMaksv090654
 for <perforce@freebsd.org>; Mon, 22 Jul 2013 22:36:47 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6MMak8d090651
 for perforce@freebsd.org; Mon, 22 Jul 2013 22:36:46 GMT
 (envelope-from brooks@freebsd.org)
Date: Mon, 22 Jul 2013 22:36:46 GMT
Message-Id: <201307222236.r6MMak8d090651@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 231356 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, 22 Jul 2013 22:36:48 -0000

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

Change 231356 by brooks@brooks_zenith on 2013/07/22 22:36:32

	Make sys/tesla-kernel.h include tesla-macros.h which in turn
	includes tesla.h.  When TESLA is not defined in the
	pre-processor supress the include of tesla.h and
	define __tesla_inline_assertion() to a macro that expands to
	nothing which restores the ability of kernels without options
	TESLA to build.

Affected files ...

.. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/test/tesla_test.c#3 edit
.. //depot/projects/ctsrd/tesla/src/sys/kern/kern_prot.c#4 edit
.. //depot/projects/ctsrd/tesla/src/sys/kern/vfs_vnops.c#4 edit
.. //depot/projects/ctsrd/tesla/src/sys/sys/tesla-kernel.h#6 edit
.. //depot/projects/ctsrd/tesla/src/sys/ufs/ffs/ffs_vnops.c#12 edit

Differences ...

==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/test/tesla_test.c#3 (text+ko) ====

@@ -35,8 +35,6 @@
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 
-#include <tesla.h>
-#include <tesla-macros.h>
 #include <sys/tesla-kernel.h>
 
 /*

==== //depot/projects/ctsrd/tesla/src/sys/kern/kern_prot.c#4 (text+ko) ====

@@ -71,8 +71,6 @@
 #include <sys/syscallsubr.h>
 #include <sys/sysctl.h>
 
-#include <tesla.h>
-#include <tesla-macros.h>
 #include <sys/tesla-kernel.h>
 
 #ifdef REGRESSION

==== //depot/projects/ctsrd/tesla/src/sys/kern/vfs_vnops.c#4 (text+ko) ====

@@ -75,9 +75,6 @@
 #include <security/audit/audit.h>
 #include <security/mac/mac_framework.h>
 
-#include <tesla-macros.h>
-#include <tesla.h>
-
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 #include <vm/pmap.h>

==== //depot/projects/ctsrd/tesla/src/sys/sys/tesla-kernel.h#6 (text+ko) ====

@@ -31,6 +31,14 @@
 #ifndef _SYS_TESLA_KERNEL_H_
 #define	_SYS_TESLA_KERNEL_H_
 
+#ifndef TESLA
+/* Cause the include of tesla.h to have no effect */
+#define	TESLA_H
+#define	__tesla_inline_assertion(...)
+#endif
+
+#include <tesla-macros.h>
+
 /*
  * FreeBSD kernel-specific TESLA macros.
  */

==== //depot/projects/ctsrd/tesla/src/sys/ufs/ffs/ffs_vnops.c#12 (text+ko) ====

@@ -82,8 +82,6 @@
 
 #include <security/mac/mac_framework.h>
 
-#include <tesla.h>
-#include <tesla-macros.h>
 #include <sys/tesla-kernel.h>
 
 #include <vm/vm.h>