diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-21 12:46:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-21 12:46:48 -0700 |
| commit | cd975ae0ce13e4cbb21f13ae1222bdb6a8996ba0 (patch) | |
| tree | eb3346e529b1fc120d4bb6dd3305e0a9c8698a67 /fs | |
| parent | 881bcabbde8bc13854a2cb30847abe181d31c5fd (diff) | |
| parent | 8ff98b9c993d59d6b396a42266c6d323c8f28cec (diff) | |
Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
Pull c6x updates from Mark Salter:
"Clean up some c6x Kconfig items and add support for Elf FDPIC loader."
* tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
C6X: remove unused config items
C6X: add support to build with BINFMT_ELF_FDPIC
C6X: change main arch kbuild symbol
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/Kconfig.binfmt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt index e95d1b64082..02257420274 100644 --- a/fs/Kconfig.binfmt +++ b/fs/Kconfig.binfmt @@ -33,7 +33,7 @@ config ARCH_BINFMT_ELF_RANDOMIZE_PIE config BINFMT_ELF_FDPIC bool "Kernel support for FDPIC ELF binaries" default y - depends on (FRV || BLACKFIN || (SUPERH32 && !MMU)) + depends on (FRV || BLACKFIN || (SUPERH32 && !MMU) || C6X) 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 |