svn commit: r203278 - in projects/capabilities8/sys: amd64/conf i386/conf

[Robert Watson]

Author: rwatson
Date: Sun Jan 31 12:07:13 2010
New Revision: 203278
URL: http://svn.freebsd.org/changeset/base/203278

Log:
  Merge c174014 from the p4 TrustedBSD Capabilities branch to capabilities8:
  
    INVARIANT_SUPPORT also required on 8.x when compiling this kernel
    configuration.
  
  Sponsored by:	Google, Inc.

Modified:
  projects/capabilities8/sys/amd64/conf/CAPABILITIES
  projects/capabilities8/sys/i386/conf/CAPABILITIES

Modified: projects/capabilities8/sys/amd64/conf/CAPABILITIES
==============================================================================
--- projects/capabilities8/sys/amd64/conf/CAPABILITIES	Sun Jan 31 11:48:25 2010	(r203277)
+++ projects/capabilities8/sys/amd64/conf/CAPABILITIES	Sun Jan 31 12:07:13 2010	(r203278)
@@ -4,6 +4,7 @@ ident CAPABILITIES
 options CAPABILITIES
 options PROCDESC
 options KDTRACE_HOOKS
+options INVARIANT_SUPPORT
 options INVARIANTS
 options WITNESS
 options KDB

Modified: projects/capabilities8/sys/i386/conf/CAPABILITIES
==============================================================================
--- projects/capabilities8/sys/i386/conf/CAPABILITIES	Sun Jan 31 11:48:25 2010	(r203277)
+++ projects/capabilities8/sys/i386/conf/CAPABILITIES	Sun Jan 31 12:07:13 2010	(r203278)
@@ -4,6 +4,7 @@ ident CAPABILITIES
 options CAPABILITIES
 options PROCDESC
 options KDTRACE_HOOKS
+options INVARIANT_SUPPORT
 options INVARIANTS
 options WITNESS
 options KDB