linux-kernel - Re: linux-next: manual merge of the akpm-current tree with the generic-ioremap tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20191223140151.7aceb059297338f5912b0f35@linux-foundation.org>
Date:   Mon, 23 Dec 2019 14:01:51 -0800
From:   Andrew Morton <akpm@...ux-foundation.org>
To:     Christoph Hellwig <hch@....de>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Nick Desaulniers <ndesaulniers@...gle.com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the
 generic-ioremap tree

On Sat, 21 Dec 2019 09:32:11 +0100 Christoph Hellwig <hch@....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@...gle.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@...gle.com>
Suggested-by: Nathan Chancellor <natechancellor@...il.com>
Acked-by: Brian Cain <bcain@...eaurora.org>
Cc: Lee Jones <lee.jones@...aro.org>
Cc: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
Cc: Tuowen Zhao <ztuowen@...il.com>
Cc: Mika Westerberg <mika.westerberg@...ux.intel.com>
Cc: Luis Chamberlain <mcgrof@...nel.org>
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Cc: Alexios Zavras <alexios.zavras@...el.com>
Cc: Allison Randal <allison@...utok.net>
Cc: Will Deacon <will@...nel.org>
Cc: Richard Fontana <rfontana@...hat.com>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Boqun Feng <boqun.feng@...il.com>
Cc: Ingo Molnar <mingo@...hat.com>
Cc: Geert Uytterhoeven <geert@...ux-m68k.org>
Signed-off-by: Andrew Morton <akpm@...ux-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
_