Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / fs / Kconfig.binfmt

diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
index 9875025..f3d3d81 100644 (file)
--- a/fs/Kconfig.binfmt
+++ b/fs/Kconfig.binfmt
@@ -1,6 +1,6 @@
 config BINFMT_ELF
        bool "Kernel support for ELF binaries"
-       depends on MMU
+       depends on MMU && (BROKEN || !FRV)
        default y
        ---help---
          ELF (Executable and Linkable Format) is a format for libraries and
@@ -23,6 +23,19 @@ config BINFMT_ELF
          ld.so (check the file <file:Documentation/Changes> for location and
          latest version).
 
+config BINFMT_ELF_FDPIC
+       bool "Kernel support for FDPIC ELF binaries"
+       default y
+       depends on FRV
+       help
+         ELF FDPIC binaries are based on ELF, but allow the individual load
+         segments of a binary to be located in memory independently of each
+         other. This makes this format ideal for use in environments where no
+         MMU is available as it still permits text segments to be shared,
+         even if data segments are not.
+
+         It is also possible to run FDPIC ELF binaries on MMU linux also.
+
 config BINFMT_FLAT
        tristate "Kernel support for flat binaries"
        depends on !MMU || SUPERH
@@ -44,7 +57,7 @@ config BINFMT_SHARED_FLAT
 
 config BINFMT_AOUT
        tristate "Kernel support for a.out and ECOFF binaries"
-       depends on (X86 && !X86_64) || ALPHA || ARM || M68K || SPARC32
+       depends on X86_32 || ALPHA || ARM || M68K || SPARC32
        ---help---
          A.out (Assembler.OUTput) is a set of formats for libraries and
          executables used in the earliest versions of UNIX.  Linux used