aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m32r/include/asm/flat.h
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@infradead.org>2017-07-30 10:25:37 -0700
committerAl Viro <viro@zeniv.linux.org.uk>2017-08-31 17:32:42 -0400
commitb38e51cd167927225ae0c26bd404403b7b1cd2f3 (patch)
tree2806d9b8ee935e99c70b43c6e11a74548c1e2008 /arch/m32r/include/asm/flat.h
parentcompat_hdio_ioctl: Fix a declaration (diff)
downloadlinux-dev-b38e51cd167927225ae0c26bd404403b7b1cd2f3.tar.xz
linux-dev-b38e51cd167927225ae0c26bd404403b7b1cd2f3.zip
binfmt_flat: fix arch/m32r and arch/microblaze flat_put_addr_at_rp()
Change the m32r flat_put_addr_at_rp() function to return int and always return 0. The microblaze function already returned 0 so just change its function return type from void to int. Seven (7) other arch-es already have this function as returning an int type result. Fixes: 468138d78510 (binfmt_flat: flat_{get,put}_addr_from_rp() should be able to fail) Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Cc: Al Viro <viro@zeniv.linux.org.uk> Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to '')
-rw-r--r--arch/m32r/include/asm/flat.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/m32r/include/asm/flat.h b/arch/m32r/include/asm/flat.h
index 455ce7ddbf14..dfcb0e4eb256 100644
--- a/arch/m32r/include/asm/flat.h
+++ b/arch/m32r/include/asm/flat.h
@@ -95,7 +95,7 @@ static inline unsigned long m32r_flat_get_addr_from_rp (u32 *rp,
return ~0; /* bogus value */
}
-static inline void flat_put_addr_at_rp(u32 *rp, u32 addr, u32 relval)
+static inline int flat_put_addr_at_rp(u32 *rp, u32 addr, u32 relval)
{
unsigned int reloc = flat_m32r_get_reloc_type (relval);
if (reloc & 0xf0) {
@@ -133,6 +133,7 @@ static inline void flat_put_addr_at_rp(u32 *rp, u32 addr, u32 relval)
break;
}
}
+ return 0;
}
// kludge - text_len is a local variable in the only user.