diff options
author | Christoph Hellwig <hch@lst.de> | 2019-06-13 03:08:51 -0400 |
---|---|---|
committer | Greg Ungerer <gerg@kernel.org> | 2019-06-23 19:16:46 -0400 |
commit | bdd15a288492f2f496a904c69c4b332057ae2ef6 (patch) | |
tree | 453e2a0303f4ff9c2b8381a413fe9285a56472d5 /arch/m68k | |
parent | 1d52dca117434eca9c6efc9c22d24e7a341ad903 (diff) |
binfmt_flat: replace flat_argvp_envp_on_stack with a Kconfig variable
This will eventually allow us to kill the need for an <asm/flat.h> for
many cases.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Tested-by: Vladimir Murzin <vladimir.murzin@arm.com>
Reviewed-by: Vladimir Murzin <vladimir.murzin@arm.com>
Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r-- | arch/m68k/Kconfig | 1 | ||||
-rw-r--r-- | arch/m68k/include/asm/flat.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 218e037ef901..fd69ee5ad6ab 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig | |||
@@ -7,6 +7,7 @@ config M68K | |||
7 | select ARCH_MIGHT_HAVE_PC_PARPORT if ISA | 7 | select ARCH_MIGHT_HAVE_PC_PARPORT if ISA |
8 | select ARCH_NO_COHERENT_DMA_MMAP if !MMU | 8 | select ARCH_NO_COHERENT_DMA_MMAP if !MMU |
9 | select ARCH_NO_PREEMPT if !COLDFIRE | 9 | select ARCH_NO_PREEMPT if !COLDFIRE |
10 | select BINFMT_FLAT_ARGVP_ENVP_ON_STACK | ||
10 | select HAVE_IDE | 11 | select HAVE_IDE |
11 | select HAVE_AOUT if MMU | 12 | select HAVE_AOUT if MMU |
12 | select HAVE_DEBUG_BUGVERBOSE | 13 | select HAVE_DEBUG_BUGVERBOSE |
diff --git a/arch/m68k/include/asm/flat.h b/arch/m68k/include/asm/flat.h index 7b1fb5c2809e..d7102fcd43eb 100644 --- a/arch/m68k/include/asm/flat.h +++ b/arch/m68k/include/asm/flat.h | |||
@@ -8,7 +8,6 @@ | |||
8 | 8 | ||
9 | #include <linux/uaccess.h> | 9 | #include <linux/uaccess.h> |
10 | 10 | ||
11 | #define flat_argvp_envp_on_stack() 1 | ||
12 | static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags, | 11 | static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags, |
13 | u32 *addr, u32 *persistent) | 12 | u32 *addr, u32 *persistent) |
14 | { | 13 | { |