diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-07 01:22:01 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-07 01:22:01 +0300 |
| commit | 3b69e8b4571125bec1f77f886174fe6cab6b9d75 (patch) | |
| tree | 4a125694310d161b6cb3097c4bf7542e97919987 /fs/Kconfig.binfmt | |
| parent | b170290c2836c40ab565736ba37681eb3dfd79b8 (diff) | |
| parent | 37744feebc086908fd89760650f458ab19071750 (diff) | |
| download | linux-3b69e8b4571125bec1f77f886174fe6cab6b9d75.tar.xz | |
Merge tag 'sh-for-5.8' of git://git.libc.org/linux-sh
Pull arch/sh updates from Rich Felker:
"Fix for arch/sh build regression with newer binutils, removal of SH5,
fixes for module exports, and misc cleanup"
* tag 'sh-for-5.8' of git://git.libc.org/linux-sh:
sh: remove sh5 support
sh: add missing EXPORT_SYMBOL() for __delay
sh: Convert ins[bwl]/outs[bwl] macros to inline functions
sh: Convert iounmap() macros to inline functions
sh: Add missing DECLARE_EXPORT() for __ashiftrt_r4_xx
sh: configs: Cleanup old Kconfig IO scheduler options
arch/sh: vmlinux.scr
sh: Replace CONFIG_MTD_M25P80 with CONFIG_MTD_SPI_NOR in sh7757lcr_defconfig
sh: sh4a: Bring back tmu3_device early device
Diffstat (limited to 'fs/Kconfig.binfmt')
| -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 04f86b8c100e..8cd471da3255 100644 --- a/fs/Kconfig.binfmt +++ b/fs/Kconfig.binfmt @@ -45,7 +45,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 || (SUPERH32 && !MMU) || C6X) + depends on (ARM || (SUPERH && !MMU) || C6X) select ELFCORE help ELF FDPIC binaries are based on ELF, but allow the individual load |