tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Christoph Hellwig and committed by
Greg Ungerer 1d52dca1 02da2833

+6 -8
-1
arch/arm/include/asm/flat.h
··· 9 9 #include <linux/uaccess.h> 10 10 11 11 #define flat_argvp_envp_on_stack() 1 12 - #define flat_old_ram_flag(flags) (flags) 13 12 14 13 static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags, 15 14 u32 *addr, u32 *persistent)
-1
arch/c6x/include/asm/flat.h
··· 5 5 #include <asm/unaligned.h> 6 6 7 7 #define flat_argvp_envp_on_stack() 0 8 - #define flat_old_ram_flag(flags) (flags) 9 8 static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags, 10 9 u32 *addr, u32 *persistent) 11 10 {
+1
arch/h8300/Kconfig
··· 2 2 config H8300 3 3 def_bool y 4 4 select ARCH_32BIT_OFF_T 5 + select BINFMT_FLAT_OLD_ALWAYS_RAM 5 6 select GENERIC_ATOMIC64 6 7 select HAVE_UID16 7 8 select VIRT_TO_BUS
-1
arch/h8300/include/asm/flat.h
··· 9 9 #include <asm/unaligned.h> 10 10 11 11 #define flat_argvp_envp_on_stack() 1 12 - #define flat_old_ram_flag(flags) 1 13 12 14 13 /* 15 14 * on the H8 a couple of the relocations have an instruction in the
-1
arch/m68k/include/asm/flat.h
··· 9 9 #include <linux/uaccess.h> 10 10 11 11 #define flat_argvp_envp_on_stack() 1 12 - #define flat_old_ram_flag(flags) (flags) 13 12 static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags, 14 13 u32 *addr, u32 *persistent) 15 14 {
-1
arch/microblaze/include/asm/flat.h
··· 14 14 #include <asm/unaligned.h> 15 15 16 16 #define flat_argvp_envp_on_stack() 0 17 - #define flat_old_ram_flag(flags) (flags) 18 17 19 18 /* 20 19 * Microblaze works a little differently from other arches, because
-1
arch/sh/include/asm/flat.h
··· 12 12 #include <asm/unaligned.h> 13 13 14 14 #define flat_argvp_envp_on_stack() 0 15 - #define flat_old_ram_flag(flags) (flags) 16 15 static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags, 17 16 u32 *addr, u32 *persistent) 18 17 {
-1
arch/xtensa/include/asm/flat.h
··· 5 5 #include <asm/unaligned.h> 6 6 7 7 #define flat_argvp_envp_on_stack() 0 8 - #define flat_old_ram_flag(flags) (flags) 9 8 static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags, 10 9 u32 *addr, u32 *persistent) 11 10 {
+3
fs/Kconfig.binfmt
··· 97 97 help 98 98 Support uClinux FLAT format binaries. 99 99 100 + config BINFMT_FLAT_OLD_ALWAYS_RAM 101 + bool 102 + 100 103 config BINFMT_ZFLAT 101 104 bool "Enable ZFLAT support" 102 105 depends on BINFMT_FLAT
+2 -1
fs/binfmt_flat.c
··· 488 488 * fix up the flags for the older format, there were all kinds 489 489 * of endian hacks, this only works for the simple cases 490 490 */ 491 - if (rev == OLD_FLAT_VERSION && flat_old_ram_flag(flags)) 491 + if (rev == OLD_FLAT_VERSION && 492 + (flags || IS_ENABLED(CONFIG_BINFMT_FLAT_OLD_ALWAYS_RAM))) 492 493 flags = FLAT_FLAG_RAM; 493 494 494 495 #ifndef CONFIG_BINFMT_ZFLAT