binfmt_flat: provide a default version of flat_get_relocate_addr

This way only the two architectures that do masking need to provide
the helper.

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 576241d74704b236964a089e056bb106973c977f..a185fe023b602fb33f469b96b7a3e89389b135e6 100644 (file)
--- a/arch/arm/include/asm/flat.h
+++ b/arch/arm/include/asm/flat.h
@@ -30,6 +30,4 @@ static inline int flat_put_addr_at_rp(u32 __user *rp, u32 addr, u32 rel)
 #endif
 }
 
-#define        flat_get_relocate_addr(rel)             (rel)
-
 #endif /* __ARM_FLAT_H__ */

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

diff --git a/arch/m68k/include/asm/flat.h b/arch/m68k/include/asm/flat.h
index 955617bb937be60b498c2d20b481e557367371fd..217fa89c8e34b90139a5a7396b72bda51846e0ef 100644 (file)
--- a/arch/m68k/include/asm/flat.h
+++ b/arch/m68k/include/asm/flat.h
@@ -28,7 +28,6 @@ static inline int flat_put_addr_at_rp(u32 __user *rp, u32 addr, u32 rel)
        return put_user(addr, rp);
 #endif
 }
-#define        flat_get_relocate_addr(rel)             (rel)
 
 #define FLAT_PLAT_INIT(regs) \
        do { \

diff --git a/arch/sh/include/asm/flat.h b/arch/sh/include/asm/flat.h
index 6f3b18679a987e259fa0fbdca79ca4b7a376213f..0d520b4cc5ea99c3631e70eb8d09ab9c5b9fb498 100644 (file)
--- a/arch/sh/include/asm/flat.h
+++ b/arch/sh/include/asm/flat.h
@@ -24,7 +24,6 @@ static inline int flat_put_addr_at_rp(u32 __user *rp, u32 addr, u32 rel)
        put_unaligned(addr, (__force u32 *)rp);
        return 0;
 }
-#define        flat_get_relocate_addr(rel)             (rel)
 
 #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 b1bc0d9a8d4ed2b7985facb9a8b80c5768872b50..a1d88aa3ef8a5ef44ccd2bd28eeeda2c9156b270 100644 (file)
--- a/arch/xtensa/include/asm/flat.h
+++ b/arch/xtensa/include/asm/flat.h
@@ -17,6 +17,5 @@ static inline int flat_put_addr_at_rp(u32 __user *rp, u32 addr, u32 rel)
        put_unaligned(addr, (__force u32 *)rp);
        return 0;
 }
-#define flat_get_relocate_addr(rel)                    (rel)
 
 #endif /* __ASM_XTENSA_FLAT_H */

diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
index a4c0b245ab1fa971d57ea92082edcd36a6666910..c0e4535dc1ecc39cc3d789094fb0e3fd315e4408 100644 (file)
--- a/fs/binfmt_flat.c
+++ b/fs/binfmt_flat.c
@@ -43,6 +43,10 @@
 #include <asm/cacheflush.h>
 #include <asm/page.h>
 
+#ifndef flat_get_relocate_addr
+#define flat_get_relocate_addr(rel)    (rel)
+#endif
+
 /****************************************************************************/
 
 /*