Merge tag 'for-v3.7' of git://git.infradead.org/users/cbou/linux-pstore

[deliverable/linux.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index cb003a3c9122e5be10ec0628049f954a4e3310a9..ed6334dd5e718cb874e4b4d272b652fadb101a8d 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1199,6 +1199,7 @@ config BUG
           Just say Y.
 
 config ELF_CORE
+       depends on COREDUMP
        default y
        bool "Enable ELF core dumps" if EXPERT
        help
@@ -1581,4 +1582,10 @@ config PADATA
        depends on SMP
        bool
 
+# Can be selected by architectures with broken toolchains
+# that get confused by correct const<->read_only section
+# mappings
+config BROKEN_RODATA
+       bool
+
 source "kernel/Kconfig.locks"