binfmt_flat: remove flat_set_persistent

This helper is a no-op on all architectures, remove it.

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>

diff --git a/arch/arm/include/asm/flat.h b/arch/arm/include/asm/flat.h
index 10cce9ecf1513b1e538086ac17ecc89e1ea6d6d2..576241d74704b236964a089e056bb106973c977f 100644 (file)
--- a/arch/arm/include/asm/flat.h
+++ b/arch/arm/include/asm/flat.h
@@ -31,6 +31,5 @@ static inline int flat_put_addr_at_rp(u32 __user *rp, u32 addr, u32 rel)
 }
 
 #define        flat_get_relocate_addr(rel)             (rel)
-#define        flat_set_persistent(relval, p)          0
 
 #endif /* __ARM_FLAT_H__ */

diff --git a/arch/c6x/include/asm/flat.h b/arch/c6x/include/asm/flat.h
index ecc6aea6606c533b152356b12b9474af8ff8a70d..ac87368efad110bf532217b295220f2cd639a04f 100644 (file)
--- a/arch/c6x/include/asm/flat.h
+++ b/arch/c6x/include/asm/flat.h
@@ -18,6 +18,5 @@ static inline int flat_put_addr_at_rp(u32 __user *rp, u32 addr, u32 rel)
        return 0;
 }
 #define flat_get_relocate_addr(rel)                    (rel)
-#define flat_set_persistent(relval, p)                 0
 
 #endif /* __ASM_C6X_FLAT_H */

diff --git a/arch/h8300/include/asm/flat.h b/arch/h8300/include/asm/flat.h
index dcc7775115dde7fb8e069c6b0a883addca6672e3..7ef7eefded3d83c99b76798911aee69cdbf60747 100644 (file)
--- a/arch/h8300/include/asm/flat.h
+++ b/arch/h8300/include/asm/flat.h
@@ -10,7 +10,6 @@
 
 #define        flat_argvp_envp_on_stack()              1
 #define        flat_old_ram_flag(flags)                1
-#define        flat_set_persistent(relval, p)          0
 
 /*
  * on the H8 a couple of the relocations have an instruction in the

diff --git a/arch/m68k/include/asm/flat.h b/arch/m68k/include/asm/flat.h
index a631caf5e18fb19467fb7fc17bf012042aa5a131..955617bb937be60b498c2d20b481e557367371fd 100644 (file)
--- a/arch/m68k/include/asm/flat.h
+++ b/arch/m68k/include/asm/flat.h
@@ -30,11 +30,6 @@ static inline int flat_put_addr_at_rp(u32 __user *rp, u32 addr, u32 rel)
 }
 #define        flat_get_relocate_addr(rel)             (rel)
 
-static inline int flat_set_persistent(u32 relval, u32 *persistent)
-{
-       return 0;
-}
-
 #define FLAT_PLAT_INIT(regs) \
        do { \
                if (current->mm) \

diff --git a/arch/microblaze/include/asm/flat.h b/arch/microblaze/include/asm/flat.h
index 34be5ed011bed241e6e31ede50f4ae265b04221b..846084fa7f0456ab85d8a29ae185a8c05626d60a 100644 (file)
--- a/arch/microblaze/include/asm/flat.h
+++ b/arch/microblaze/include/asm/flat.h
@@ -15,7 +15,6 @@
 
 #define        flat_argvp_envp_on_stack()      0
 #define        flat_old_ram_flag(flags)        (flags)
-#define        flat_set_persistent(relval, p)          0
 
 /*
  * Microblaze works a little differently from other arches, because

diff --git a/arch/sh/include/asm/flat.h b/arch/sh/include/asm/flat.h
index 8f2929b32f2e80b3e0d1e4c2e865e77ae9a157df..6f3b18679a987e259fa0fbdca79ca4b7a376213f 100644 (file)
--- a/arch/sh/include/asm/flat.h
+++ b/arch/sh/include/asm/flat.h
@@ -25,7 +25,6 @@ static inline int flat_put_addr_at_rp(u32 __user *rp, u32 addr, u32 rel)
        return 0;
 }
 #define        flat_get_relocate_addr(rel)             (rel)
-#define        flat_set_persistent(relval, p)          ({ (void)p; 0; })
 
 #define FLAT_PLAT_INIT(_r) \
   do { _r->regs[0]=0; _r->regs[1]=0; _r->regs[2]=0; _r->regs[3]=0; \

diff --git a/arch/xtensa/include/asm/flat.h b/arch/xtensa/include/asm/flat.h
index 6ee5a35eb0ecd19221a8ee92470ae4dc9ed16c5f..b1bc0d9a8d4ed2b7985facb9a8b80c5768872b50 100644 (file)
--- a/arch/xtensa/include/asm/flat.h
+++ b/arch/xtensa/include/asm/flat.h
@@ -18,6 +18,5 @@ static inline int flat_put_addr_at_rp(u32 __user *rp, u32 addr, u32 rel)
        return 0;
 }
 #define flat_get_relocate_addr(rel)                    (rel)
-#define flat_set_persistent(relval, p)                 0
 
 #endif /* __ASM_XTENSA_FLAT_H */

diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
index afddea583999441e2bf5494d5d8320e589ba87fb..a4c0b245ab1fa971d57ea92082edcd36a6666910 100644 (file)
--- a/fs/binfmt_flat.c
+++ b/fs/binfmt_flat.c
@@ -787,8 +787,6 @@ static int load_flat_file(struct linux_binprm *bprm,
                        if (get_user(relval, reloc + i))
                                return -EFAULT;
                        relval = ntohl(relval);
-                       if (flat_set_persistent(relval, &persistent))
-                               continue;
                        addr = flat_get_relocate_addr(relval);
                        rp = (u32 __user *)calc_reloc(addr, libinfo, id, 1);
                        if (rp == (u32 __user *)RELOC_FAILED) {