aboutsummaryrefslogtreecommitdiff
path: root/sys/i386/conf/GENERIC
diff options
context:
space:
mode:
authorRobert Watson <rwatson@FreeBSD.org>2009-06-02 18:31:08 +0000
committerRobert Watson <rwatson@FreeBSD.org>2009-06-02 18:31:08 +0000
commitbd875f5f13b7874fc451fd1295730f577bcbc2bd (patch)
treec54525a6e0aff1a518bfb0388e7af117d0d32e4b /sys/i386/conf/GENERIC
parent923f9901b4a70015b5218ed0121f542da1002618 (diff)
downloadsrc-bd875f5f13b7874fc451fd1295730f577bcbc2bd.tar.gz
src-bd875f5f13b7874fc451fd1295730f577bcbc2bd.zip
Remove MAC kernel config files and add "options MAC" to GENERIC, with the
goal of shipping 8.0 with MAC support in the default kernel. No policies will be compiled in or enabled by default, but it will now be possible to load them at boot or runtime without a kernel recompile. While the framework is not believed to impose measurable overhead when no policies are loaded (a result of optimization over the past few months in HEAD), we'll continue to benchmark and optimize as the release approaches. Please keep an eye out for performance or functionality regressions that could be a result of this change. Approved by: re (kensmith) Obtained from: TrustedBSD Project
Notes
Notes: svn path=/head/; revision=193334
Diffstat (limited to 'sys/i386/conf/GENERIC')
-rw-r--r--sys/i386/conf/GENERIC1
1 files changed, 1 insertions, 0 deletions
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 7475efd48c2f..08edaf77f2ae 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -71,6 +71,7 @@ options KBD_INSTALL_CDEV # install a CDEV entry in /dev
options STOP_NMI # Stop CPUS using NMI instead of IPI
options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4)
options AUDIT # Security event auditing
+options MAC # TrustedBSD MAC Framework
#options KDTRACE_HOOKS # Kernel DTrace hooks
# Debugging for use in -current