Merge branch 'core-rseq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index b695a3e..86ae4c4 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -272,6 +272,13 @@ config HAVE_REGS_AND_STACK_ACCESS_API
          declared in asm/ptrace.h
          For example the kprobes-based event tracer needs this API.
 
+config HAVE_RSEQ
+       bool
+       depends on HAVE_REGS_AND_STACK_ACCESS_API
+       help
+         This symbol should be selected by an architecture if it
+         supports an implementation of restartable sequences.
+
 config HAVE_CLK
        bool
        help
@@ -597,21 +604,6 @@ config CC_STACKPROTECTOR_AUTO
 
 endchoice
 
-config LD_DEAD_CODE_DATA_ELIMINATION
-       bool
-       help
-         Select this if the architecture wants to do dead code and
-         data elimination with the linker by compiling with
-         -ffunction-sections -fdata-sections and linking with
-         --gc-sections.
-
-         This requires that the arch annotates or otherwise protects
-         its external entry points from being discarded. Linker scripts
-         must also merge .text.*, .data.*, and .bss.* correctly into
-         output sections. Care must be taken not to pull in unrelated
-         sections (e.g., '.text.init'). Typically '.' in section names
-         is used to distinguish them from label names / C identifiers.
-
 config HAVE_ARCH_WITHIN_STACK_FRAMES
        bool
        help
@@ -687,12 +679,6 @@ config MODULES_USE_ELF_REL
          Modules only use ELF REL relocations.  Modules with ELF RELA
          relocations will give an error.
 
-config HAVE_UNDERSCORE_SYMBOL_PREFIX
-       bool
-       help
-         Some architectures generate an _ in front of C symbols; things like
-         module loading and assembly files need to know about this.
-
 config HAVE_IRQ_EXIT_ON_IRQ_STACK
        bool
        help