From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Alexander Viro <viro@zeniv.linux.org.uk>,
Linus Torvalds <torvalds@linux-foundation.org>
Cc: Steven Miao <realmz6@gmail.com>,
Yoshinori Sato <ysato@users.sourceforge.jp>,
Greg Ungerer <gerg@linux-m68k.org>,
adi-buildroot-devel@lists.sourceforge.net,
uclinux-h8-devel@lists.sourceforge.jp,
linux-m68k@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-kernel@vger.kernel.org,
Geert Uytterhoeven <geert@linux-m68k.org>
Subject: [PATCH 2/3] blackfin, m68k: Fix flat_set_persistent() for unsigned long to u32 changes
Date: Sun, 16 Jul 2017 13:57:28 +0200 [thread overview]
Message-ID: <1500206249-16670-2-git-send-email-geert@linux-m68k.org> (raw)
In-Reply-To: <1500206249-16670-1-git-send-email-geert@linux-m68k.org>
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>
---
arch/blackfin/include/asm/flat.h | 3 +--
arch/m68k/include/asm/flat.h | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/blackfin/include/asm/flat.h b/arch/blackfin/include/asm/flat.h
index 296d7f56fbfd005b..f1d6ba7afbf245a0 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)
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) {
diff --git a/arch/m68k/include/asm/flat.h b/arch/m68k/include/asm/flat.h
index 48b62790fe70f1a6..b2a41f5b3890a524 100644
--- a/arch/m68k/include/asm/flat.h
+++ b/arch/m68k/include/asm/flat.h
@@ -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;
}
--
2.7.4
next prev parent reply other threads:[~2017-07-16 11:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-16 11:57 [PATCH 1/3] binfmt_flat: Use %u to format u32 Geert Uytterhoeven
2017-07-16 11:57 ` Geert Uytterhoeven [this message]
2017-07-16 11:57 ` [PATCH 3/3] h8300: Add missing closing parenthesis in flat_get_addr_from_rp() Geert Uytterhoeven
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1500206249-16670-2-git-send-email-geert@linux-m68k.org \
--to=geert@linux-m68k.org \
--cc=adi-buildroot-devel@lists.sourceforge.net \
--cc=gerg@linux-m68k.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@vger.kernel.org \
--cc=realmz6@gmail.com \
--cc=torvalds@linux-foundation.org \
--cc=uclinux-h8-devel@lists.sourceforge.jp \
--cc=viro@zeniv.linux.org.uk \
--cc=ysato@users.sourceforge.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).