Merge tag 'v3.13-rc7' into x86/efi-kexec to resolve conflicts

[pandora-kernel.git] / drivers / firmware / efi / Kconfig

diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig
index 6aecbc8..1e75f48 100644 (file)
--- a/drivers/firmware/efi/Kconfig
+++ b/drivers/firmware/efi/Kconfig
@@ -36,6 +36,17 @@ config EFI_VARS_PSTORE_DEFAULT_DISABLE
          backend for pstore by default. This setting can be overridden
          using the efivars module's pstore_disable parameter.
 
+config EFI_RUNTIME_MAP
+       bool "Export efi runtime maps to sysfs"
+       depends on X86 && EFI && KEXEC
+       default y
+       help
+         Export efi runtime memory maps to /sys/firmware/efi/runtime-map.
+         That memory map is used for example by kexec to set up efi virtual
+         mapping the 2nd kernel, but can also be used for debugging purposes.
+
+         See also Documentation/ABI/testing/sysfs-firmware-efi-runtime-map.
+
 endmenu
 
 config UEFI_CPER