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>

diff --git a/arch/c6x/include/asm/flat.h b/arch/c6x/include/asm/flat.h
index 2d57a9204d210323bb6bb3f9bb7679967d45a50f..9e6544b51386a17eed91bf30a7207998dcbf1fa8 100644 (file)
--- 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
index 4683146f0e9e7a6ee4d75e00757a39e60b050a7c..78070f924177aa9bc8471e964a81ad42d6ad7355 100644 (file)
--- 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
index 9e3d8e01d2947410bba24e084c8a12a213162fa4..1ab86770eaee24e81c0c0f8e8e8e4ae8427846d7 100644 (file)
--- 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
index 1002343dd84a8eeeab8ca91d910b234192d962b8..fee4f25555cb53e90463c7cd4e1fbf19a2e383b9 100644 (file)
--- 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
index 3d357371b28b803b5a15932f8285e86e50570c80..ed5870c779f92d940609b811b635d457bece2219 100644 (file)
--- 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
index 1e88f4e62e657d2efa29ec02aeef3b995a79907b..0ca65d51bb017bbf544b0fc94d9b86674e4b0c2d 100644 (file)
--- 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
index fcd2b45c07353305afdf6a6eb99b19a14b5f8ab0..1928a359693861c3e8880f491591888e6b5cff92 100644 (file)
--- 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;