Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b38e51cd authored by Randy Dunlap's avatar Randy Dunlap Committed by Al Viro
Browse files

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: 468138d7 (binfmt_flat: flat_{get,put}_addr_from_rp()
	should be able to fail)

Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 8363dae2

arch/m32r/include/asm/flat.h

+2 −1
Original line number Diff line number Diff line
@@ -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.

arch/microblaze/include/asm/flat.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags, 
 * unaligned.

 */



static inline void

static inline int

flat_put_addr_at_rp(u32 __user *rp, u32 addr, u32 relval)

{

	u32 *p = (__force u32 *)rp;