summaryrefslogtreecommitdiff
path: root/libre-testing/linux-libre/config.x86_64
diff options
context:
space:
mode:
authorMárcio Alexandre Silva Delgado <coadde@lavabit.com>2013-09-15 15:44:38 -0300
committerMárcio Alexandre Silva Delgado <coadde@lavabit.com>2013-09-15 15:44:38 -0300
commitee2ddecc62710a9ab8a715f2955481d201e84fbf (patch)
tree58bad9b127688358ae18c5eb2e4ca2c094885d0e /libre-testing/linux-libre/config.x86_64
parent5d514cbf527b6ccecad5e37c6826d8463fe68e2a (diff)
parentfc5c5b349fa3fcbe2d41b213c5c153cde9e9339a (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre-testing/linux-libre/config.x86_64')
-rw-r--r--libre-testing/linux-libre/config.x86_648
1 files changed, 4 insertions, 4 deletions
diff --git a/libre-testing/linux-libre/config.x86_64 b/libre-testing/linux-libre/config.x86_64
index 707d093aa..169a2285b 100644
--- a/libre-testing/linux-libre/config.x86_64
+++ b/libre-testing/linux-libre/config.x86_64
@@ -5452,9 +5452,7 @@ CONFIG_ISCSI_IBFT=m
#
# EFI (Extensible Firmware Interface) Support
#
-CONFIG_EFI_VARS=m
-CONFIG_EFI_VARS_PSTORE=m
-CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+# CONFIG_EFI_VARS is not set
#
# File systems
@@ -5979,10 +5977,12 @@ CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init"
CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
CONFIG_SECURITY_APPARMOR=y
CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
-# CONFIG_SECURITY_YAMA is not set
+CONFIG_SECURITY_YAMA=y
+CONFIG_SECURITY_YAMA_STACKED=y
# CONFIG_IMA is not set
# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
+# CONFIG_DEFAULT_SECURITY_YAMA is not set
CONFIG_DEFAULT_SECURITY_DAC=y
CONFIG_DEFAULT_SECURITY=""
CONFIG_XOR_BLOCKS=m