From: Andrew Morton <akpm@linux-foundation•org>
To: Christoph Hellwig <hch@lst•de>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Nick Desaulniers <ndesaulniers@google•com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the generic-ioremap tree
Date: Mon, 23 Dec 2019 14:01:51 -0800 [thread overview]
Message-ID: <20191223140151.7aceb059297338f5912b0f35@linux-foundation.org> (raw)
In-Reply-To: <20191221083211.GA3465@lst.de>
On Sat, 21 Dec 2019 09:32:11 +0100 Christoph Hellwig <hch@lst•de> wrote:
> Andrew,
>
> do you plan to send this to Linus for 5.5 to fix the warning from the
> new devm_ioremap_uc addition in this cycle? If so I can rebase the
> ioremap tree one more time.
I'm not sure what to do about this because of
https://lore.kernel.org/lkml/CAMuHMdUO=cZMsFx4t_uULNRuwnGLjbRYOJAo7j5gC-iSV3wy5w@mail.gmail.com/
I'd rather just drop the patch. Can you please take care of it all?
From: Nick Desaulniers <ndesaulniers@google•com>
Subject: hexagon: define ioremap_uc
Similar to commit 38e45d81d14e ("sparc64: implement ioremap_uc") define
ioremap_uc for hexagon to avoid errors from
-Wimplicit-function-definition.
Link: http://lkml.kernel.org/r/20191209222956.239798-2-ndesaulniers@google.com
Link: https://github.com/ClangBuiltLinux/linux/issues/797
Fixes: e537654b7039 ("lib: devres: add a helper function for ioremap_uc")
Signed-off-by: Nick Desaulniers <ndesaulniers@google•com>
Suggested-by: Nathan Chancellor <natechancellor@gmail•com>
Acked-by: Brian Cain <bcain@codeaurora•org>
Cc: Lee Jones <lee.jones@linaro•org>
Cc: Andy Shevchenko <andriy.shevchenko@linux•intel.com>
Cc: Tuowen Zhao <ztuowen@gmail•com>
Cc: Mika Westerberg <mika.westerberg@linux•intel.com>
Cc: Luis Chamberlain <mcgrof@kernel•org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation•org>
Cc: Alexios Zavras <alexios.zavras@intel•com>
Cc: Allison Randal <allison@lohutok•net>
Cc: Will Deacon <will@kernel•org>
Cc: Richard Fontana <rfontana@redhat•com>
Cc: Thomas Gleixner <tglx@linutronix•de>
Cc: Peter Zijlstra <peterz@infradead•org>
Cc: Boqun Feng <boqun.feng@gmail•com>
Cc: Ingo Molnar <mingo@redhat•com>
Cc: Geert Uytterhoeven <geert@linux-m68k•org>
Signed-off-by: Andrew Morton <akpm@linux-foundation•org>
---
arch/hexagon/include/asm/io.h | 1 +
1 file changed, 1 insertion(+)
--- a/arch/hexagon/include/asm/io.h~hexagon-define-ioremap_uc
+++ a/arch/hexagon/include/asm/io.h
@@ -173,6 +173,7 @@ static inline void writel(u32 data, vola
void __iomem *ioremap(unsigned long phys_addr, unsigned long size);
#define ioremap_nocache ioremap
+#define ioremap_uc(X, Y) ioremap((X), (Y))
#define __raw_writel writel
_
next prev parent reply other threads:[~2019-12-23 22:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-18 2:30 linux-next: manual merge of the akpm-current tree with the generic-ioremap tree Stephen Rothwell
2019-12-21 8:32 ` Christoph Hellwig
2019-12-23 22:01 ` Andrew Morton [this message]
2020-01-06 5:02 ` Stephen Rothwell
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=20191223140151.7aceb059297338f5912b0f35@linux-foundation.org \
--to=akpm@linux-foundation$(echo .)org \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ndesaulniers@google$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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