binfmt_flat: provide a default version of flat_get_relocate_addr

Christoph Hellwig · Greg Ungerer · commit 02da283302f7 · 2019-06-24T09:16:46.000+10:00
This way only the two architectures that do masking need to provide
the helper.

Signed-off-by: Christoph Hellwig &lt;hch@lst.de&gt;
Tested-by: Vladimir Murzin &lt;vladimir.murzin@arm.com&gt;
Reviewed-by: Vladimir Murzin &lt;vladimir.murzin@arm.com&gt;
Signed-off-by: Greg Ungerer &lt;gerg@linux-m68k.org&gt;
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
+
 /****************************************************************************/
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,4 @@ static inline int flat_put_addr_at_rp(u32 __user *rp, u32 addr, u32 rel)`
`30`	`30`	`#endif`
`31`	`31`	`}`
`32`	`32`
`33`		`-#define flat_get_relocate_addr(rel) (rel)`
`34`		`-`
`35`	`33`	`#endif /* __ARM_FLAT_H__ */`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,5 @@ static inline int flat_put_addr_at_rp(u32 __user *rp, u32 addr, u32 rel)`
`17`	`17`	`put_unaligned(addr, (__force u32 *)rp);`
`18`	`18`	`return 0;`
`19`	`19`	`}`
`20`		`-#define flat_get_relocate_addr(rel) (rel)`
`21`	`20`
`22`	`21`	`#endif /* __ASM_C6X_FLAT_H */`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ static inline int flat_put_addr_at_rp(u32 __user *rp, u32 addr, u32 rel)`
`28`	`28`	`return put_user(addr, rp);`
`29`	`29`	`#endif`
`30`	`30`	`}`
`31`		`-#define flat_get_relocate_addr(rel) (rel)`
`32`	`31`
`33`	`32`	`#define FLAT_PLAT_INIT(regs) \`
`34`	`33`	`do { \`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ static inline int flat_put_addr_at_rp(u32 __user *rp, u32 addr, u32 rel)`
`24`	`24`	`put_unaligned(addr, (__force u32 *)rp);`
`25`	`25`	`return 0;`
`26`	`26`	`}`
`27`		`-#define flat_get_relocate_addr(rel) (rel)`
`28`	`27`
`29`	`28`	`#define FLAT_PLAT_INIT(_r) \`
`30`	`29`	`do { _r->regs[0]=0; _r->regs[1]=0; _r->regs[2]=0; _r->regs[3]=0; \`