summaryrefslogtreecommitdiffstats
path: root/fs/binfmt_flat.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2019-06-13 09:08:50 +0200
committerGreg Ungerer <gerg@kernel.org>2019-06-24 01:16:46 +0200
commit1d52dca117434eca9c6efc9c22d24e7a341ad903 (patch)
tree249aea82255fa6e87ef98602cc79255ce6dfe853 /fs/binfmt_flat.c
parentbinfmt_flat: provide a default version of flat_get_relocate_addr (diff)
downloadlinux-1d52dca117434eca9c6efc9c22d24e7a341ad903.tar.xz
linux-1d52dca117434eca9c6efc9c22d24e7a341ad903.zip
binfmt_flat: remove flat_old_ram_flag
Instead add a Kconfig variable that only h8300 selects. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
Diffstat (limited to 'fs/binfmt_flat.c')
-rw-r--r--fs/binfmt_flat.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
index c0e4535dc1ec..3e7f4a6cffa2 100644
--- a/fs/binfmt_flat.c
+++ b/fs/binfmt_flat.c
@@ -488,7 +488,8 @@ static int load_flat_file(struct linux_binprm *bprm,
* fix up the flags for the older format, there were all kinds
* of endian hacks, this only works for the simple cases
*/
- if (rev == OLD_FLAT_VERSION && flat_old_ram_flag(flags))
+ if (rev == OLD_FLAT_VERSION &&
+ (flags || IS_ENABLED(CONFIG_BINFMT_FLAT_OLD_ALWAYS_RAM)))
flags = FLAT_FLAG_RAM;
#ifndef CONFIG_BINFMT_ZFLAT