summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-10-10 14:21:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2022-10-10 14:21:11 -0700
commite2302539dd4f1c62d96651c07ddb05aa2461d29c (patch)
treea6192095ca826be08b5fc60803ab2efbf83efe73 /fs
parent34fdd22c8fd9c5ebda999b5bb1bfe25f293bd030 (diff)
parente3ddb8bbe0f8cc994748c81e17acc58fda6f8abe (diff)
Merge tag 'xtensa-20221010' of https://github.com/jcmvbkbc/linux-xtensa
Pull xtensa updates from Max Filippov: - add support for FDPIC and static PIE executable formats for noMMU * tag 'xtensa-20221010' of https://github.com/jcmvbkbc/linux-xtensa: xtensa: add FDPIC and static PIE support for noMMU xtensa: clean up ELF_PLAT_INIT macro
Diffstat (limited to 'fs')
-rw-r--r--fs/Kconfig.binfmt2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
index f14478643b91..93539aac0e5b 100644
--- a/fs/Kconfig.binfmt
+++ b/fs/Kconfig.binfmt
@@ -58,7 +58,7 @@ config ARCH_USE_GNU_PROPERTY
config BINFMT_ELF_FDPIC
bool "Kernel support for FDPIC ELF binaries"
default y if !BINFMT_ELF
- depends on ARM || ((M68K || SUPERH) && !MMU)
+ depends on ARM || ((M68K || SUPERH || XTENSA) && !MMU)
select ELFCORE
help
ELF FDPIC binaries are based on ELF, but allow the individual load