Date: Mon, 22 Jul 2013 22:36:46 GMT From: Brooks Davis <brooks@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 231356 for review Message-ID: <201307222236.r6MMak8d090651@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307222236.r6MMak8d090651>