From: Vladimir Murzin <vladimir.murzin@arm.com>
To: Christoph Hellwig <hch@lst.de>, Greg Ungerer <gerg@linux-m68k.org>
Cc: uclinux-h8-devel@lists.sourceforge.jp,
linux-xtensa@linux-xtensa.org, Michal Simek <monstr@monstr.eu>,
linux-c6x-dev@linux-c6x.org, linux-sh@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org,
linux-riscv@lists.infradead.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 04/15] binfmt_flat: remove flat_old_ram_flag
Date: Tue, 11 Jun 2019 10:47:45 +0100 [thread overview]
Message-ID: <ccb6cf72-70b1-e17a-772b-3e107b8cc5a9@arm.com> (raw)
In-Reply-To: <20190610212015.9157-5-hch@lst.de>
On 6/10/19 10:20 PM, Christoph Hellwig wrote:
> Instead add a Kconfig variable that only h8300 selects.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> arch/arm/include/asm/flat.h | 1 -
> arch/c6x/include/asm/flat.h | 1 -
> arch/h8300/Kconfig | 1 +
> arch/h8300/include/asm/flat.h | 1 -
> arch/m68k/include/asm/flat.h | 1 -
> arch/microblaze/include/asm/flat.h | 1 -
> arch/sh/include/asm/flat.h | 1 -
> arch/xtensa/include/asm/flat.h | 1 -
> fs/Kconfig.binfmt | 3 +++
> fs/binfmt_flat.c | 3 ++-
> 10 files changed, 6 insertions(+), 8 deletions(-)
>
For ARM bits:
Tested-by: Vladimir Murzin <vladimir.murzin@arm.com>
Reviewed-by: Vladimir Murzin <vladimir.murzin@arm.com>
> diff --git a/arch/arm/include/asm/flat.h b/arch/arm/include/asm/flat.h
> index a185fe023b60..acf162111ee2 100644
> --- a/arch/arm/include/asm/flat.h
> +++ b/arch/arm/include/asm/flat.h
> @@ -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)
> diff --git a/arch/c6x/include/asm/flat.h b/arch/c6x/include/asm/flat.h
> index c4d703b454c6..353e4d06e8c0 100644
> --- a/arch/c6x/include/asm/flat.h
> +++ b/arch/c6x/include/asm/flat.h
> @@ -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)
> {
> diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
> index ecfc4b4b6373..d30e8727b02d 100644
> --- a/arch/h8300/Kconfig
> +++ b/arch/h8300/Kconfig
> @@ -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
> diff --git a/arch/h8300/include/asm/flat.h b/arch/h8300/include/asm/flat.h
> index 7ef7eefded3d..14cc928d5478 100644
> --- a/arch/h8300/include/asm/flat.h
> +++ b/arch/h8300/include/asm/flat.h
> @@ -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
> diff --git a/arch/m68k/include/asm/flat.h b/arch/m68k/include/asm/flat.h
> index 217fa89c8e34..7b1fb5c2809e 100644
> --- a/arch/m68k/include/asm/flat.h
> +++ b/arch/m68k/include/asm/flat.h
> @@ -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)
> {
> diff --git a/arch/microblaze/include/asm/flat.h b/arch/microblaze/include/asm/flat.h
> index 846084fa7f04..1cd8d7f4cf12 100644
> --- a/arch/microblaze/include/asm/flat.h
> +++ b/arch/microblaze/include/asm/flat.h
> @@ -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
> diff --git a/arch/sh/include/asm/flat.h b/arch/sh/include/asm/flat.h
> index 0d520b4cc5ea..015678d7b771 100644
> --- a/arch/sh/include/asm/flat.h
> +++ b/arch/sh/include/asm/flat.h
> @@ -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)
> {
> diff --git a/arch/xtensa/include/asm/flat.h b/arch/xtensa/include/asm/flat.h
> index a1d88aa3ef8a..b215c1e66958 100644
> --- a/arch/xtensa/include/asm/flat.h
> +++ b/arch/xtensa/include/asm/flat.h
> @@ -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)
> {
> diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
> index f87ddd1b6d72..5658e12ad944 100644
> --- a/fs/Kconfig.binfmt
> +++ b/fs/Kconfig.binfmt
> @@ -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
> diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
> index c0e4535dc1ec..18d82fd5f57c 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 (IS_ENABLED(CONFIG_BINFMT_FLAT_OLD_ALWAYS_RAM) &&
> + rev == OLD_FLAT_VERSION)
> flags = FLAT_FLAG_RAM;
>
> #ifndef CONFIG_BINFMT_ZFLAT
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-06-11 9:47 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-10 21:20 binfmt_flat cleanups and RISC-V support Christoph Hellwig
2019-06-10 21:20 ` [PATCH 01/15] binfmt_flat: remove flat_reloc_valid Christoph Hellwig
2019-06-11 9:44 ` Vladimir Murzin
2019-06-10 21:20 ` [PATCH 02/15] binfmt_flat: remove flat_set_persistent Christoph Hellwig
2019-06-11 9:45 ` Vladimir Murzin
2019-06-10 21:20 ` [PATCH 03/15] binfmt_flat: provide a default version of flat_get_relocate_addr Christoph Hellwig
2019-06-11 9:46 ` Vladimir Murzin
2019-06-10 21:20 ` [PATCH 04/15] binfmt_flat: remove flat_old_ram_flag Christoph Hellwig
2019-06-11 6:04 ` Greg Ungerer
2019-06-11 7:36 ` Christoph Hellwig
2019-06-11 13:07 ` Greg Ungerer
2019-06-11 9:47 ` Vladimir Murzin [this message]
2019-06-10 21:20 ` [PATCH 05/15] binfmt_flat: replace flat_argvp_envp_on_stack with a Kconfig variable Christoph Hellwig
2019-06-11 9:49 ` Vladimir Murzin
2019-06-10 21:20 ` [PATCH 06/15] binfmt_flat: remove the uapi <linux/flat.h> header Christoph Hellwig
2019-06-11 9:51 ` Vladimir Murzin
2019-06-10 21:20 ` [PATCH 07/15] binfmt_flat: use __be32 for the on-disk format Christoph Hellwig
2019-06-11 8:25 ` Geert Uytterhoeven
2019-06-11 9:57 ` Vladimir Murzin
2019-06-10 21:20 ` [PATCH 08/15] binfmt_flat: add endianess annotations Christoph Hellwig
2019-06-11 9:58 ` Vladimir Murzin
2019-06-10 21:20 ` [PATCH 09/15] binfmt_flat: add a ARCH_HAS_BINFMT_FLAT option Christoph Hellwig
2019-06-11 9:59 ` Vladimir Murzin
2019-06-10 21:20 ` [PATCH 10/15] binfmt_flat: make support for old format binaries optional Christoph Hellwig
2019-06-10 21:20 ` [PATCH 11/15] binfmt_flat: provide an asm-generic/flat.h Christoph Hellwig
2019-06-11 10:01 ` Vladimir Murzin
2019-06-10 21:20 ` [PATCH 12/15] binfmt_flat: remove the persistent argument from flat_get_addr_from_rp Christoph Hellwig
2019-06-10 21:20 ` [PATCH 13/15] binfmt_flat: move the MAX_SHARED_LIBS definition to binfmt_flat.c Christoph Hellwig
2019-06-10 21:20 ` [PATCH 14/15] binfmt_flat: don't offset the data start Christoph Hellwig
2019-06-10 21:20 ` [PATCH 15/15] riscv: add binfmt_flat support Christoph Hellwig
2019-06-11 8:16 ` Vladimir Murzin
2019-06-11 9:20 ` Christoph Hellwig
2019-06-11 6:51 ` binfmt_flat cleanups and RISC-V support Greg Ungerer
2019-06-11 7:38 ` Christoph Hellwig
2019-06-11 13:02 ` Greg Ungerer
2019-06-11 8:05 ` Vladimir Murzin
2019-06-11 8:11 ` Christoph Hellwig
2019-06-11 10:08 ` Vladimir Murzin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ccb6cf72-70b1-e17a-772b-3e107b8cc5a9@arm.com \
--to=vladimir.murzin@arm.com \
--cc=gerg@linux-m68k.org \
--cc=hch@lst.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-c6x-dev@linux-c6x.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux-xtensa@linux-xtensa.org \
--cc=monstr@monstr.eu \
--cc=uclinux-h8-devel@lists.sourceforge.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).