[arch-commits] Commit in linux-lts/trunk (config config.x86_64)

[Tobias Powalowski]

    Date: Monday, September 16, 2013 @ 21:22:49
  Author: tpowa
Revision: 194485

remove EFI_VAR, add YAMA

Modified:
  linux-lts/trunk/config
  linux-lts/trunk/config.x86_64

---------------+
 config        |    8 ++++----
 config.x86_64 |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

Modified: config
===================================================================
--- config	2013-09-16 19:13:37 UTC (rev 194484)
+++ config	2013-09-16 19:22:49 UTC (rev 194485)
@@ -5618,9 +5618,7 @@
 #
 # 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
@@ -6107,10 +6105,12 @@
 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

Modified: config.x86_64
===================================================================
--- config.x86_64	2013-09-16 19:13:37 UTC (rev 194484)
+++ config.x86_64	2013-09-16 19:22:49 UTC (rev 194485)
@@ -5408,9 +5408,7 @@
 #
 # 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
@@ -5898,10 +5896,12 @@
 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