summaryrefslogtreecommitdiff
path: root/security/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-12 17:05:39 +0400
committerIngo Molnar <mingo@elte.hu>2008-10-12 17:05:39 +0400
commita9b9e81c915e4a57ac3b21d1a7fa7ff184639780 (patch)
tree98304395fbb5b9c74fca35b196cd414c1949f280 /security/Kconfig
parenta8b71a2810386a5ac8f43d2095fe3355f0d8db37 (diff)
parentfd048088306656824958e7783ffcee27e241b361 (diff)
downloadlinux-a9b9e81c915e4a57ac3b21d1a7fa7ff184639780.tar.xz
Merge branch 'linus' into x86/memory-corruption-check
Diffstat (limited to 'security/Kconfig')
-rw-r--r--security/Kconfig8
1 files changed, 8 insertions, 0 deletions
diff --git a/security/Kconfig b/security/Kconfig
index 559293922a47..d9f47ce7e207 100644
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -51,6 +51,14 @@ config SECURITY
If you are unsure how to answer this question, answer N.
+config SECURITYFS
+ bool "Enable the securityfs filesystem"
+ help
+ This will build the securityfs filesystem. It is currently used by
+ the TPM bios character driver. It is not used by SELinux or SMACK.
+
+ If you are unsure how to answer this question, answer N.
+
config SECURITY_NETWORK
bool "Socket and Networking Security Hooks"
depends on SECURITY