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: 468138d785
("binfmt_flat: flat_{get,put}_addr_from_rp() should be able to fail")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
a86054236d
commit
9f42ef4bc2
|
@ -44,8 +44,7 @@ flat_get_relocate_addr (unsigned long relval)
|
||||||
return relval & 0x03ffffff; /* Mask out top 6 bits */
|
return relval & 0x03ffffff; /* Mask out top 6 bits */
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int flat_set_persistent(unsigned long relval,
|
static inline int flat_set_persistent(u32 relval, u32 *persistent)
|
||||||
unsigned long *persistent)
|
|
||||||
{
|
{
|
||||||
int type = (relval >> 26) & 7;
|
int type = (relval >> 26) & 7;
|
||||||
if (type == 3) {
|
if (type == 3) {
|
||||||
|
|
|
@ -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)
|
#define flat_get_relocate_addr(rel) (rel)
|
||||||
|
|
||||||
static inline int flat_set_persistent(unsigned long relval,
|
static inline int flat_set_persistent(u32 relval, u32 *persistent)
|
||||||
unsigned long *persistent)
|
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue