binfmt_flat: remove the persistent argument from flat_get_addr_from_rp

Christoph Hellwig · Greg Ungerer · commit 6843d8aa5b9b · 2019-06-24T09:16:47.000+10:00
The argument is never used.

Signed-off-by: Christoph Hellwig &lt;hch@lst.de&gt;
Signed-off-by: Greg Ungerer &lt;gerg@linux-m68k.org&gt;
diff --git a/arch/c6x/include/asm/flat.h b/arch/c6x/include/asm/flat.h
@@ -5,7 +5,7 @@
 #include <asm/unaligned.h>
 
 static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags,
-					u32 *addr, u32 *persistent)
+					u32 *addr)
 {
 	*addr = get_unaligned((__force u32 *)rp);
 	return 0;
diff --git a/arch/h8300/include/asm/flat.h b/arch/h8300/include/asm/flat.h
@@ -17,7 +17,7 @@
 
 #define	flat_get_relocate_addr(rel)		(rel & ~0x00000001)
 static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags,
-					u32 *addr, u32 *persistent)
+					u32 *addr)
 {
 	u32 val = get_unaligned((__force u32 *)rp);
 	if (!(flags & FLAT_FLAG_GOTPIC))
diff --git a/arch/microblaze/include/asm/flat.h b/arch/microblaze/include/asm/flat.h
@@ -28,7 +28,7 @@
  */
 
 static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags,
-					u32 *addr, u32 *persistent)
+					u32 *addr)
 {
 	u32 *p = (__force u32 *)rp;
 
diff --git a/arch/sh/include/asm/flat.h b/arch/sh/include/asm/flat.h
@@ -12,7 +12,7 @@
 #include <asm/unaligned.h>
 
 static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags,
-					u32 *addr, u32 *persistent)
+					u32 *addr)
 {
 	*addr = get_unaligned((__force u32 *)rp);
 	return 0;
diff --git a/arch/xtensa/include/asm/flat.h b/arch/xtensa/include/asm/flat.h
@@ -5,7 +5,7 @@
 #include <asm/unaligned.h>
 
 static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags,
-					u32 *addr, u32 *persistent)
+					u32 *addr)
 {
 	*addr = get_unaligned((__force u32 *)rp);
 	return 0;
diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
@@ -795,7 +795,6 @@ static int load_flat_file(struct linux_binprm *bprm,
 	 * __start to address 4 so that is okay).
 	 */
 	if (rev > OLD_FLAT_VERSION) {
-		u32 __maybe_unused persistent = 0;
 		for (i = 0; i < relocs; i++) {
 			u32 addr, relval;
 			__be32 tmp;
@@ -816,8 +815,7 @@ static int load_flat_file(struct linux_binprm *bprm,
 			}
 
 			/* Get the pointer's value.  */
-			ret = flat_get_addr_from_rp(rp, relval, flags,
-							&addr, &persistent);
+			ret = flat_get_addr_from_rp(rp, relval, flags, &addr);
 			if (unlikely(ret))
 				goto err;
 
diff --git a/include/asm-generic/flat.h b/include/asm-generic/flat.h
@@ -5,7 +5,7 @@
 #include <linux/uaccess.h>
 
 static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags,
-		u32 *addr, u32 *persistent)
+		u32 *addr)
 {
 #ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
 	return copy_from_user(addr, rp, 4) ? -EFAULT : 0;

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`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;`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`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))`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`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`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`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;`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`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;`