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

Commit 9f42ef4b authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds
Browse files

blackfin, m68k: Fix flat_set_persistent() for unsigned long to u32 changes 



Several variables had their types changed from unsigned long to u32, but
the arch-specific implementations of flat_set_persistent() weren't
updated, leading to compiler warnings on blackfin and m68k:

    fs/binfmt_flat.c: In function ‘load_flat_file’:
    fs/binfmt_flat.c:799: warning: passing argument 2 of ‘flat_set_persistent’ from incompatible pointer type

Fixes: 468138d7 ("binfmt_flat: flat_{get,put}_addr_from_rp() should be able to fail")
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a8605423

arch/blackfin/include/asm/flat.h

+1 −2
Original line number Diff line number Diff line
@@ -44,8 +44,7 @@ flat_get_relocate_addr (unsigned long relval) 
	return relval & 0x03ffffff; /* Mask out top 6 bits */

}



static inline int flat_set_persistent(unsigned long relval,

				      unsigned long *persistent)

static inline int flat_set_persistent(u32 relval, u32 *persistent)

{

	int type = (relval >> 26) & 7;

	if (type == 3) {

arch/m68k/include/asm/flat.h

+1 −2
Original line number Diff line number Diff line
@@ -30,8 +30,7 @@ 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(unsigned long relval,

				      unsigned long *persistent)

static inline int flat_set_persistent(u32 relval, u32 *persistent)

{

	return 0;

}