diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2017-07-16 07:57:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-16 12:24:06 -0400 |
| commit | 9f42ef4bc26b83bd33feb9a9fa55e25e5752a495 (patch) | |
| tree | b3683fecc85efc1159d3d5410a8768c3a81a0e80 /arch/blackfin | |
| parent | a86054236d356b973b360c43c4d43fef6555db13 (diff) | |
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: 468138d78510688f ("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>
Diffstat (limited to 'arch/blackfin')
| -rw-r--r-- | arch/blackfin/include/asm/flat.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/blackfin/include/asm/flat.h b/arch/blackfin/include/asm/flat.h index 296d7f56fbfd..f1d6ba7afbf2 100644 --- a/arch/blackfin/include/asm/flat.h +++ b/arch/blackfin/include/asm/flat.h | |||
| @@ -44,8 +44,7 @@ flat_get_relocate_addr (unsigned long relval) | |||
| 44 | return relval & 0x03ffffff; /* Mask out top 6 bits */ | 44 | return relval & 0x03ffffff; /* Mask out top 6 bits */ |
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | static inline int flat_set_persistent(unsigned long relval, | 47 | static inline int flat_set_persistent(u32 relval, u32 *persistent) |
| 48 | unsigned long *persistent) | ||
| 49 | { | 48 | { |
| 50 | int type = (relval >> 26) & 7; | 49 | int type = (relval >> 26) & 7; |
| 51 | if (type == 3) { | 50 | if (type == 3) { |