Skip to content

Commit

Permalink
binfmt_flat: remove flat_old_ram_flag
Browse files Browse the repository at this point in the history
Instead add a Kconfig variable that only h8300 selects.

Signed-off-by: Christoph Hellwig <[email protected]>
Signed-off-by: Greg Ungerer <[email protected]>
  • Loading branch information
Christoph Hellwig authored and Greg Ungerer committed Jun 23, 2019
1 parent 02da283 commit 1d52dca
Show file tree
Hide file tree
Showing 10 changed files with 6 additions and 8 deletions.
1 change: 0 additions & 1 deletion arch/arm/include/asm/flat.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include <linux/uaccess.h>

#define flat_argvp_envp_on_stack() 1
#define flat_old_ram_flag(flags) (flags)

static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags,
u32 *addr, u32 *persistent)
Expand Down
1 change: 0 additions & 1 deletion arch/c6x/include/asm/flat.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include <asm/unaligned.h>

#define flat_argvp_envp_on_stack() 0
#define flat_old_ram_flag(flags) (flags)
static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags,
u32 *addr, u32 *persistent)
{
Expand Down
1 change: 1 addition & 0 deletions arch/h8300/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
config H8300
def_bool y
select ARCH_32BIT_OFF_T
select BINFMT_FLAT_OLD_ALWAYS_RAM
select GENERIC_ATOMIC64
select HAVE_UID16
select VIRT_TO_BUS
Expand Down
1 change: 0 additions & 1 deletion arch/h8300/include/asm/flat.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include <asm/unaligned.h>

#define flat_argvp_envp_on_stack() 1
#define flat_old_ram_flag(flags) 1

/*
* on the H8 a couple of the relocations have an instruction in the
Expand Down
1 change: 0 additions & 1 deletion arch/m68k/include/asm/flat.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include <linux/uaccess.h>

#define flat_argvp_envp_on_stack() 1
#define flat_old_ram_flag(flags) (flags)
static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags,
u32 *addr, u32 *persistent)
{
Expand Down
1 change: 0 additions & 1 deletion arch/microblaze/include/asm/flat.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include <asm/unaligned.h>

#define flat_argvp_envp_on_stack() 0
#define flat_old_ram_flag(flags) (flags)

/*
* Microblaze works a little differently from other arches, because
Expand Down
1 change: 0 additions & 1 deletion arch/sh/include/asm/flat.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include <asm/unaligned.h>

#define flat_argvp_envp_on_stack() 0
#define flat_old_ram_flag(flags) (flags)
static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags,
u32 *addr, u32 *persistent)
{
Expand Down
1 change: 0 additions & 1 deletion arch/xtensa/include/asm/flat.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include <asm/unaligned.h>

#define flat_argvp_envp_on_stack() 0
#define flat_old_ram_flag(flags) (flags)
static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags,
u32 *addr, u32 *persistent)
{
Expand Down
3 changes: 3 additions & 0 deletions fs/Kconfig.binfmt
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ config BINFMT_FLAT
help
Support uClinux FLAT format binaries.

config BINFMT_FLAT_OLD_ALWAYS_RAM
bool

config BINFMT_ZFLAT
bool "Enable ZFLAT support"
depends on BINFMT_FLAT
Expand Down
3 changes: 2 additions & 1 deletion fs/binfmt_flat.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1d52dca

Please sign in to comment.