linux-kernel - [PATCH] cris: add ioremap_nocache declaration before include asm-generic/io.h.

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-next>] [day] [month] [year] [list]

Date:   Fri,  2 Mar 2018 00:38:38 +0800
From:   Greentime Hu <green.hu@...il.com>
To:     linux-cris-kernel@...s.com, linux-kernel@...r.kernel.org,
        arnd@...db.de, linux-arch@...r.kernel.org, greentime@...estech.com,
        green.hu@...il.com, jesper.nilsson@...s.com, starvik@...s.com
Subject: [PATCH] cris: add ioremap_nocache declaration before include asm-generic/io.h.

A future commit for the nds32 architecture bootstrap("asm-generic/io.h:
move ioremap_nocache/ioremap_uc/ioremap_wc/ioremap_wt out of ifndef
CONFIG_MMU") will move the ioremap_nocache out of the CONFIG_MMU ifdef.
This means that in order to suppress re-definition errors we need to
setup #define's before importing asm-generic/io.h.

Signed-off-by: Greentime Hu <greentime@...estech.com>
---
 arch/cris/include/asm/io.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/cris/include/asm/io.h b/arch/cris/include/asm/io.h
index c92712d30f54..3867db75c314 100644
--- a/arch/cris/include/asm/io.h
+++ b/arch/cris/include/asm/io.h
@@ -20,6 +20,7 @@ static inline void __iomem * ioremap (unsigned long offset, unsigned long size)
 extern void iounmap(volatile void * __iomem addr);
 
 extern void __iomem * ioremap_nocache(unsigned long offset, unsigned long size);
+#define ioremap_nocache ioremap_nocache
 
 #include <asm-generic/io.h>
 
-- 
I am picking up the patch in the nds32 tree that caused the regression.
Subject: [linux-next:master 3188/3885] include/asm-generic/io.h:864:15: error: conflicting types for 'ioremap'

tree:   https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git master
head:   eced78aae9cba83072d5335fbc9b2282a9270469
commit: b3ada9d0ce8d286c8bbbb02fdbddec5036242b42 [3188/3885] asm-generic/io.h: move ioremap_nocache/ioremap_uc/ioremap_wc/ioremap_wt out of ifndef CONFIG_MMU
config: cris-etrax-100lx_v2_defconfig (attached as .config)
compiler: cris-linux-gcc (GCC) 7.2.0
reproduce:
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        git checkout b3ada9d0ce8d286c8bbbb02fdbddec5036242b42
        # save the attached .config to linux build tree
        make.cross ARCH=cris

All errors (new ones prefixed by >>):

   In file included from arch/cris/include/asm/io.h:24:0,
                    from include/linux/io.h:25,
                    from include/linux/irq.h:25,
                    from include/asm-generic/hardirq.h:13,
                    from ./arch/cris/include/generated/asm/hardirq.h:1,
                    from include/linux/hardirq.h:9,
                    from include/linux/trace_events.h:9,
                    from include/trace/syscall.h:7,
                    from include/linux/syscalls.h:82,
                    from init/main.c:20:
>> include/asm-generic/io.h:864:15: error: conflicting types for 'ioremap'
    void __iomem *ioremap(phys_addr_t phys_addr, size_t size);
                  ^~~~~~~