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

binfmt_flat: remove the persistent argument from flat_get_addr_from_rp

The argument is never used.

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 6843d8aa 7a8998c9

+7 -9
+1 -1
arch/c6x/include/asm/flat.h
··· 5 5 #include <asm/unaligned.h> 6 6 7 7 static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags, 8 - u32 *addr, u32 *persistent) 8 + u32 *addr) 9 9 { 10 10 *addr = get_unaligned((__force u32 *)rp); 11 11 return 0;
+1 -1
arch/h8300/include/asm/flat.h
··· 17 17 18 18 #define flat_get_relocate_addr(rel) (rel & ~0x00000001) 19 19 static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags, 20 - u32 *addr, u32 *persistent) 20 + u32 *addr) 21 21 { 22 22 u32 val = get_unaligned((__force u32 *)rp); 23 23 if (!(flags & FLAT_FLAG_GOTPIC))
+1 -1
arch/microblaze/include/asm/flat.h
··· 28 28 */ 29 29 30 30 static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags, 31 - u32 *addr, u32 *persistent) 31 + u32 *addr) 32 32 { 33 33 u32 *p = (__force u32 *)rp; 34 34
+1 -1
arch/sh/include/asm/flat.h
··· 12 12 #include <asm/unaligned.h> 13 13 14 14 static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags, 15 - u32 *addr, u32 *persistent) 15 + u32 *addr) 16 16 { 17 17 *addr = get_unaligned((__force u32 *)rp); 18 18 return 0;
+1 -1
arch/xtensa/include/asm/flat.h
··· 5 5 #include <asm/unaligned.h> 6 6 7 7 static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags, 8 - u32 *addr, u32 *persistent) 8 + u32 *addr) 9 9 { 10 10 *addr = get_unaligned((__force u32 *)rp); 11 11 return 0;
+1 -3
fs/binfmt_flat.c
··· 795 795 * __start to address 4 so that is okay). 796 796 */ 797 797 if (rev > OLD_FLAT_VERSION) { 798 - u32 __maybe_unused persistent = 0; 799 798 for (i = 0; i < relocs; i++) { 800 799 u32 addr, relval; 801 800 __be32 tmp; ··· 815 816 } 816 817 817 818 /* Get the pointer's value. */ 818 - ret = flat_get_addr_from_rp(rp, relval, flags, 819 - &addr, &persistent); 819 + ret = flat_get_addr_from_rp(rp, relval, flags, &addr); 820 820 if (unlikely(ret)) 821 821 goto err; 822 822
+1 -1
include/asm-generic/flat.h
··· 5 5 #include <linux/uaccess.h> 6 6 7 7 static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags, 8 - u32 *addr, u32 *persistent) 8 + u32 *addr) 9 9 { 10 10 #ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS 11 11 return copy_from_user(addr, rp, 4) ? -EFAULT : 0;