9f42ef4bc2
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>
45 lines
1005 B
C
45 lines
1005 B
C
/*
|
|
* flat.h -- uClinux flat-format executables
|
|
*/
|
|
|
|
#ifndef __M68KNOMMU_FLAT_H__
|
|
#define __M68KNOMMU_FLAT_H__
|
|
|
|
#include <linux/uaccess.h>
|
|
|
|
#define flat_argvp_envp_on_stack() 1
|
|
#define flat_old_ram_flag(flags) (flags)
|
|
#define flat_reloc_valid(reloc, size) ((reloc) <= (size))
|
|
static inline int flat_get_addr_from_rp(u32 __user *rp, u32 relval, u32 flags,
|
|
u32 *addr, u32 *persistent)
|
|
{
|
|
#ifdef CONFIG_CPU_HAS_NO_UNALIGNED
|
|
return copy_from_user(addr, rp, 4) ? -EFAULT : 0;
|
|
#else
|
|
return get_user(*addr, rp);
|
|
#endif
|
|
}
|
|
|
|
static inline int flat_put_addr_at_rp(u32 __user *rp, u32 addr, u32 rel)
|
|
{
|
|
#ifdef CONFIG_CPU_HAS_NO_UNALIGNED
|
|
return copy_to_user(rp, &addr, 4) ? -EFAULT : 0;
|
|
#else
|
|
return put_user(addr, rp);
|
|
#endif
|
|
}
|
|
#define flat_get_relocate_addr(rel) (rel)
|
|
|
|
static inline int flat_set_persistent(u32 relval, u32 *persistent)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
#define FLAT_PLAT_INIT(regs) \
|
|
do { \
|
|
if (current->mm) \
|
|
(regs)->d5 = current->mm->start_data; \
|
|
} while (0)
|
|
|
|
#endif /* __M68KNOMMU_FLAT_H__ */
|