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: <CAEbi=3dvLKVOtU+oZN5rLhHcyZUy2V2-a=-u5PjgUmasF-Jpgw@mail.gmail.com>
Date:   Fri, 22 Dec 2017 22:38:54 +0800
From:   Greentime Hu <green.hu@...il.com>
To:     kbuild test robot <lkp@...el.com>
Cc:     kbuild-all@...org, Greentime <greentime@...estech.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Arnd Bergmann <arnd@...db.de>,
        linux-arch <linux-arch@...r.kernel.org>,
        Thomas Gleixner <tglx@...utronix.de>,
        Jason Cooper <jason@...edaemon.net>,
        Marc Zyngier <marc.zyngier@....com>,
        Rob Herring <robh+dt@...nel.org>,
        netdev <netdev@...r.kernel.org>,
        Vincent Chen <deanbo422@...il.com>,
        DTML <devicetree@...r.kernel.org>,
        Al Viro <viro@...iv.linux.org.uk>,
        David Howells <dhowells@...hat.com>,
        Will Deacon <will.deacon@....com>,
        Daniel Lezcano <daniel.lezcano@...aro.org>,
        linux-serial@...r.kernel.org,
        Geert Uytterhoeven <geert.uytterhoeven@...il.com>,
        Linus Walleij <linus.walleij@...aro.org>,
        Mark Rutland <mark.rutland@....com>, Greg KH <greg@...ah.com>,
        Guo Ren <ren_guo@...ky.com>,
        Philippe Ombredanne <pombredanne@...b.com>,
        Vincent Chen <vincentc@...estech.com>,
        David Miller <davem@...emloft.net>
Subject: Re: [PATCH v4 01/36] asm-generic/io.h: move ioremap_nocache/ioremap_uc/ioremap_wc/ioremap_wt
 out of ifndef CONFIG_MMU

2017-12-20 18:09 GMT+08:00 kbuild test robot <lkp@...el.com>:
> Hi Greentime,
>
> Thank you for the patch! Yet something to improve:
>
> [auto build test ERROR on tip/timers/core]
> [also build test ERROR on v4.15-rc4 next-20171220]
> [cannot apply to linus/master]
> [if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
>
> url:    https://github.com/0day-ci/linux/commits/Greentime-Hu/Andes-nds32-Linux-Kernel/20171220-155937
> config: sparc-defconfig (attached as .config)
> compiler: sparc-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
>         # save the attached .config to linux build tree
>         make.cross ARCH=sparc
>
> All error/warnings (new ones prefixed by >>):
>
>    In file included from arch/sparc/include/asm/io.h:6:0,
>                     from include/linux/io.h:25,
>                     from include/linux/irq.h:24,
>                     from include/asm-generic/hardirq.h:12,
>                     from arch/sparc/include/asm/hardirq_32.h:10,
>                     from arch/sparc/include/asm/hardirq.h:6,
>                     from include/linux/hardirq.h:8,
>                     from include/linux/interrupt.h:12,
>                     from arch/sparc/kernel/kernel.h:4,
>                     from arch/sparc/kernel/traps_32.c:30:
>>> arch/sparc/include/asm/io_32.h:129:15: error: conflicting types for 'ioremap'
>     void __iomem *ioremap(unsigned long offset, unsigned long size);
>                   ^~~~~~~
>    In file included from arch/sparc/include/asm/io_32.h:13:0,
>                     from arch/sparc/include/asm/io.h:6,
>                     from include/linux/io.h:25,
>                     from include/linux/irq.h:24,
>                     from include/asm-generic/hardirq.h:12,
>                     from arch/sparc/include/asm/hardirq_32.h:10,
>                     from arch/sparc/include/asm/hardirq.h:6,
>                     from include/linux/hardirq.h:8,
>                     from include/linux/interrupt.h:12,
>                     from arch/sparc/kernel/kernel.h:4,
>                     from arch/sparc/kernel/traps_32.c:30:
>    include/asm-generic/io.h:864:15: note: previous declaration of 'ioremap' was here
>     void __iomem *ioremap(phys_addr_t phys_addr, size_t size);
>                   ^~~~~~~
>    In file included from arch/sparc/include/asm/io.h:6:0,
>                     from include/linux/io.h:25,
>                     from include/linux/irq.h:24,
>                     from include/asm-generic/hardirq.h:12,
>                     from arch/sparc/include/asm/hardirq_32.h:10,
>                     from arch/sparc/include/asm/hardirq.h:6,
>                     from include/linux/hardirq.h:8,
>                     from include/linux/interrupt.h:12,
>                     from arch/sparc/kernel/kernel.h:4,
>                     from arch/sparc/kernel/traps_32.c:30:
>    arch/sparc/include/asm/io_32.h:130:0: error: "ioremap_nocache" redefined [-Werror]
>     #define ioremap_nocache(X,Y) ioremap((X),(Y))
>
>    In file included from arch/sparc/include/asm/io_32.h:13:0,
>                     from arch/sparc/include/asm/io.h:6,
>                     from include/linux/io.h:25,
>                     from include/linux/irq.h:24,
>                     from include/asm-generic/hardirq.h:12,
>                     from arch/sparc/include/asm/hardirq_32.h:10,
>                     from arch/sparc/include/asm/hardirq.h:6,
>                     from include/linux/hardirq.h:8,
>                     from include/linux/interrupt.h:12,
>                     from arch/sparc/kernel/kernel.h:4,
>                     from arch/sparc/kernel/traps_32.c:30:
>    include/asm-generic/io.h:865:0: note: this is the location of the previous definition
>     #define ioremap_nocache ioremap_nocache
>
>    In file included from arch/sparc/include/asm/io.h:6:0,
>                     from include/linux/io.h:25,
>                     from include/linux/irq.h:24,
>                     from include/asm-generic/hardirq.h:12,
>                     from arch/sparc/include/asm/hardirq_32.h:10,
>                     from arch/sparc/include/asm/hardirq.h:6,
>                     from include/linux/hardirq.h:8,
>                     from include/linux/interrupt.h:12,
>                     from arch/sparc/kernel/kernel.h:4,
>                     from arch/sparc/kernel/traps_32.c:30:
>    arch/sparc/include/asm/io_32.h:131:0: error: "ioremap_wc" redefined [-Werror]
>     #define ioremap_wc(X,Y)  ioremap((X),(Y))
>
>    In file included from arch/sparc/include/asm/io_32.h:13:0,
>                     from arch/sparc/include/asm/io.h:6,
>                     from include/linux/io.h:25,
>                     from include/linux/irq.h:24,
>                     from include/asm-generic/hardirq.h:12,
>                     from arch/sparc/include/asm/hardirq_32.h:10,
>                     from arch/sparc/include/asm/hardirq.h:6,
>                     from include/linux/hardirq.h:8,
>                     from include/linux/interrupt.h:12,
>                     from arch/sparc/kernel/kernel.h:4,
>                     from arch/sparc/kernel/traps_32.c:30:
>    include/asm-generic/io.h:881:0: note: this is the location of the previous definition
>     #define ioremap_wc ioremap_wc
>
>    In file included from arch/sparc/include/asm/io.h:6:0,
>                     from include/linux/io.h:25,
>                     from include/linux/irq.h:24,
>                     from include/asm-generic/hardirq.h:12,
>                     from arch/sparc/include/asm/hardirq_32.h:10,
>                     from arch/sparc/include/asm/hardirq.h:6,
>                     from include/linux/hardirq.h:8,
>                     from include/linux/interrupt.h:12,
>                     from arch/sparc/kernel/kernel.h:4,
>                     from arch/sparc/kernel/traps_32.c:30:
>    arch/sparc/include/asm/io_32.h:132:0: error: "ioremap_wt" redefined [-Werror]
>     #define ioremap_wt(X,Y)  ioremap((X),(Y))
>
>    In file included from arch/sparc/include/asm/io_32.h:13:0,
>                     from arch/sparc/include/asm/io.h:6,
>                     from include/linux/io.h:25,
>                     from include/linux/irq.h:24,
>                     from include/asm-generic/hardirq.h:12,
>                     from arch/sparc/include/asm/hardirq_32.h:10,
>                     from arch/sparc/include/asm/hardirq.h:6,
>                     from include/linux/hardirq.h:8,
>                     from include/linux/interrupt.h:12,
>                     from arch/sparc/kernel/kernel.h:4,
>                     from arch/sparc/kernel/traps_32.c:30:
>    include/asm-generic/io.h:889:0: note: this is the location of the previous definition
>     #define ioremap_wt ioremap_wt
>
>    cc1: all warnings being treated as errors
> --
>    In file included from arch/sparc/include/asm/io.h:6:0,
>                     from include/linux/io.h:25,
>                     from include/linux/irq.h:24,
>                     from include/asm-generic/hardirq.h:12,
>                     from arch/sparc/include/asm/hardirq_32.h:10,
>                     from arch/sparc/include/asm/hardirq.h:6,
>                     from include/linux/hardirq.h:8,
>                     from include/linux/interrupt.h:12,
>                     from include/linux/pci.h:31,
>                     from arch/sparc/kernel/ioport.c:36:
>>> arch/sparc/include/asm/io_32.h:129:15: error: conflicting types for 'ioremap'
>     void __iomem *ioremap(unsigned long offset, unsigned long size);
>                   ^~~~~~~
>    In file included from arch/sparc/include/asm/io_32.h:13:0,
>                     from arch/sparc/include/asm/io.h:6,
>                     from include/linux/io.h:25,
>                     from include/linux/irq.h:24,
>                     from include/asm-generic/hardirq.h:12,
>                     from arch/sparc/include/asm/hardirq_32.h:10,
>                     from arch/sparc/include/asm/hardirq.h:6,
>                     from include/linux/hardirq.h:8,
>                     from include/linux/interrupt.h:12,
>                     from include/linux/pci.h:31,
>                     from arch/sparc/kernel/ioport.c:36:
>    include/asm-generic/io.h:864:15: note: previous declaration of 'ioremap' was here
>     void __iomem *ioremap(phys_addr_t phys_addr, size_t size);
>                   ^~~~~~~
>    In file included from arch/sparc/include/asm/io.h:6:0,
>                     from include/linux/io.h:25,
>                     from include/linux/irq.h:24,
>                     from include/asm-generic/hardirq.h:12,
>                     from arch/sparc/include/asm/hardirq_32.h:10,
>                     from arch/sparc/include/asm/hardirq.h:6,
>                     from include/linux/hardirq.h:8,
>                     from include/linux/interrupt.h:12,
>                     from include/linux/pci.h:31,
>                     from arch/sparc/kernel/ioport.c:36:
>    arch/sparc/include/asm/io_32.h:130:0: error: "ioremap_nocache" redefined [-Werror]
>     #define ioremap_nocache(X,Y) ioremap((X),(Y))
>
>    In file included from arch/sparc/include/asm/io_32.h:13:0,
>                     from arch/sparc/include/asm/io.h:6,
>                     from include/linux/io.h:25,
>                     from include/linux/irq.h:24,
>                     from include/asm-generic/hardirq.h:12,
>                     from arch/sparc/include/asm/hardirq_32.h:10,
>                     from arch/sparc/include/asm/hardirq.h:6,
>                     from include/linux/hardirq.h:8,
>                     from include/linux/interrupt.h:12,
>                     from include/linux/pci.h:31,
>                     from arch/sparc/kernel/ioport.c:36:
>    include/asm-generic/io.h:865:0: note: this is the location of the previous definition
>     #define ioremap_nocache ioremap_nocache
>
>    In file included from arch/sparc/include/asm/io.h:6:0,
>                     from include/linux/io.h:25,
>                     from include/linux/irq.h:24,
>                     from include/asm-generic/hardirq.h:12,
>                     from arch/sparc/include/asm/hardirq_32.h:10,
>                     from arch/sparc/include/asm/hardirq.h:6,
>                     from include/linux/hardirq.h:8,
>                     from include/linux/interrupt.h:12,
>                     from include/linux/pci.h:31,
>                     from arch/sparc/kernel/ioport.c:36:
>    arch/sparc/include/asm/io_32.h:131:0: error: "ioremap_wc" redefined [-Werror]
>     #define ioremap_wc(X,Y)  ioremap((X),(Y))
>
>    In file included from arch/sparc/include/asm/io_32.h:13:0,
>                     from arch/sparc/include/asm/io.h:6,
>                     from include/linux/io.h:25,
>                     from include/linux/irq.h:24,
>                     from include/asm-generic/hardirq.h:12,
>                     from arch/sparc/include/asm/hardirq_32.h:10,
>                     from arch/sparc/include/asm/hardirq.h:6,
>                     from include/linux/hardirq.h:8,
>                     from include/linux/interrupt.h:12,
>                     from include/linux/pci.h:31,
>                     from arch/sparc/kernel/ioport.c:36:
>    include/asm-generic/io.h:881:0: note: this is the location of the previous definition
>     #define ioremap_wc ioremap_wc
>
>    In file included from arch/sparc/include/asm/io.h:6:0,
>                     from include/linux/io.h:25,
>                     from include/linux/irq.h:24,
>                     from include/asm-generic/hardirq.h:12,
>                     from arch/sparc/include/asm/hardirq_32.h:10,
>                     from arch/sparc/include/asm/hardirq.h:6,
>                     from include/linux/hardirq.h:8,
>                     from include/linux/interrupt.h:12,
>                     from include/linux/pci.h:31,
>                     from arch/sparc/kernel/ioport.c:36:
>    arch/sparc/include/asm/io_32.h:132:0: error: "ioremap_wt" redefined [-Werror]
>     #define ioremap_wt(X,Y)  ioremap((X),(Y))
>
>    In file included from arch/sparc/include/asm/io_32.h:13:0,
>                     from arch/sparc/include/asm/io.h:6,
>                     from include/linux/io.h:25,
>                     from include/linux/irq.h:24,
>                     from include/asm-generic/hardirq.h:12,
>                     from arch/sparc/include/asm/hardirq_32.h:10,
>                     from arch/sparc/include/asm/hardirq.h:6,
>                     from include/linux/hardirq.h:8,
>                     from include/linux/interrupt.h:12,
>                     from include/linux/pci.h:31,
>                     from arch/sparc/kernel/ioport.c:36:
>    include/asm-generic/io.h:889:0: note: this is the location of the previous definition
>     #define ioremap_wt ioremap_wt
>
>>> arch/sparc/kernel/ioport.c:124:15: error: conflicting types for 'ioremap'
>     void __iomem *ioremap(unsigned long offset, unsigned long size)
>                   ^~~~~~~
>    In file included from arch/sparc/include/asm/io_32.h:13:0,
>                     from arch/sparc/include/asm/io.h:6,
>                     from include/linux/io.h:25,
>                     from include/linux/irq.h:24,
>                     from include/asm-generic/hardirq.h:12,
>                     from arch/sparc/include/asm/hardirq_32.h:10,
>                     from arch/sparc/include/asm/hardirq.h:6,
>                     from include/linux/hardirq.h:8,
>                     from include/linux/interrupt.h:12,
>                     from include/linux/pci.h:31,
>                     from arch/sparc/kernel/ioport.c:36:
>    include/asm-generic/io.h:864:15: note: previous declaration of 'ioremap' was here
>     void __iomem *ioremap(phys_addr_t phys_addr, size_t size);
>                   ^~~~~~~
>    In file included from include/linux/linkage.h:6:0,
>                     from include/linux/kernel.h:6,
>                     from include/linux/list.h:8,
>                     from include/linux/module.h:9,
>                     from arch/sparc/kernel/ioport.c:28:
>    arch/sparc/kernel/ioport.c:131:15: error: conflicting types for 'ioremap'
>     EXPORT_SYMBOL(ioremap);
>                   ^
>    include/linux/export.h:65:21: note: in definition of macro '___EXPORT_SYMBOL'
>      extern typeof(sym) sym;      \
>                         ^~~
>>> arch/sparc/kernel/ioport.c:131:1: note: in expansion of macro 'EXPORT_SYMBOL'
>     EXPORT_SYMBOL(ioremap);
>     ^~~~~~~~~~~~~
>    In file included from arch/sparc/include/asm/io_32.h:13:0,
>                     from arch/sparc/include/asm/io.h:6,
>                     from include/linux/io.h:25,
>                     from include/linux/irq.h:24,
>                     from include/asm-generic/hardirq.h:12,
>                     from arch/sparc/include/asm/hardirq_32.h:10,
>                     from arch/sparc/include/asm/hardirq.h:6,
>                     from include/linux/hardirq.h:8,
>                     from include/linux/interrupt.h:12,
>                     from include/linux/pci.h:31,
>                     from arch/sparc/kernel/ioport.c:36:
>    include/asm-generic/io.h:864:15: note: previous declaration of 'ioremap' was here
>     void __iomem *ioremap(phys_addr_t phys_addr, size_t size);
>                   ^~~~~~~
>    cc1: all warnings being treated as errors
> --
>    In file included from arch/sparc/include/asm/io.h:6:0,
>                     from include/linux/io.h:25,
>                     from include/linux/irq.h:24,
>                     from include/asm-generic/hardirq.h:12,
>                     from arch/sparc/include/asm/hardirq_32.h:10,
>                     from arch/sparc/include/asm/hardirq.h:6,
>                     from include/linux/hardirq.h:8,
>                     from include/linux/interrupt.h:12,
>                     from include/linux/pci.h:31,
>                     from arch/sparc//kernel/ioport.c:36:
>>> arch/sparc/include/asm/io_32.h:129:15: error: conflicting types for 'ioremap'
>     void __iomem *ioremap(unsigned long offset, unsigned long size);
>                   ^~~~~~~
>    In file included from arch/sparc/include/asm/io_32.h:13:0,
>                     from arch/sparc/include/asm/io.h:6,
>                     from include/linux/io.h:25,
>                     from include/linux/irq.h:24,
>                     from include/asm-generic/hardirq.h:12,
>                     from arch/sparc/include/asm/hardirq_32.h:10,
>                     from arch/sparc/include/asm/hardirq.h:6,
>                     from include/linux/hardirq.h:8,
>                     from include/linux/interrupt.h:12,
>                     from include/linux/pci.h:31,
>                     from arch/sparc//kernel/ioport.c:36:
>    include/asm-generic/io.h:864:15: note: previous declaration of 'ioremap' was here
>     void __iomem *ioremap(phys_addr_t phys_addr, size_t size);
>                   ^~~~~~~
>    In file included from arch/sparc/include/asm/io.h:6:0,
>                     from include/linux/io.h:25,
>                     from include/linux/irq.h:24,
>                     from include/asm-generic/hardirq.h:12,
>                     from arch/sparc/include/asm/hardirq_32.h:10,
>                     from arch/sparc/include/asm/hardirq.h:6,
>                     from include/linux/hardirq.h:8,
>                     from include/linux/interrupt.h:12,
>                     from include/linux/pci.h:31,
>                     from arch/sparc//kernel/ioport.c:36:
>    arch/sparc/include/asm/io_32.h:130:0: error: "ioremap_nocache" redefined [-Werror]
>     #define ioremap_nocache(X,Y) ioremap((X),(Y))
>
>    In file included from arch/sparc/include/asm/io_32.h:13:0,
>                     from arch/sparc/include/asm/io.h:6,
>                     from include/linux/io.h:25,
>                     from include/linux/irq.h:24,
>                     from include/asm-generic/hardirq.h:12,
>                     from arch/sparc/include/asm/hardirq_32.h:10,
>                     from arch/sparc/include/asm/hardirq.h:6,
>                     from include/linux/hardirq.h:8,
>                     from include/linux/interrupt.h:12,
>                     from include/linux/pci.h:31,
>                     from arch/sparc//kernel/ioport.c:36:
>    include/asm-generic/io.h:865:0: note: this is the location of the previous definition
>     #define ioremap_nocache ioremap_nocache
>
>    In file included from arch/sparc/include/asm/io.h:6:0,
>                     from include/linux/io.h:25,
>                     from include/linux/irq.h:24,
>                     from include/asm-generic/hardirq.h:12,
>                     from arch/sparc/include/asm/hardirq_32.h:10,
>                     from arch/sparc/include/asm/hardirq.h:6,
>                     from include/linux/hardirq.h:8,
>                     from include/linux/interrupt.h:12,
>                     from include/linux/pci.h:31,
>                     from arch/sparc//kernel/ioport.c:36:
>    arch/sparc/include/asm/io_32.h:131:0: error: "ioremap_wc" redefined [-Werror]
>     #define ioremap_wc(X,Y)  ioremap((X),(Y))
>
>    In file included from arch/sparc/include/asm/io_32.h:13:0,
>                     from arch/sparc/include/asm/io.h:6,
>                     from include/linux/io.h:25,
>                     from include/linux/irq.h:24,
>                     from include/asm-generic/hardirq.h:12,
>                     from arch/sparc/include/asm/hardirq_32.h:10,
>                     from arch/sparc/include/asm/hardirq.h:6,
>                     from include/linux/hardirq.h:8,
>                     from include/linux/interrupt.h:12,
>                     from include/linux/pci.h:31,
>                     from arch/sparc//kernel/ioport.c:36:
>    include/asm-generic/io.h:881:0: note: this is the location of the previous definition
>     #define ioremap_wc ioremap_wc
>
>    In file included from arch/sparc/include/asm/io.h:6:0,
>                     from include/linux/io.h:25,
>                     from include/linux/irq.h:24,
>                     from include/asm-generic/hardirq.h:12,
>                     from arch/sparc/include/asm/hardirq_32.h:10,
>                     from arch/sparc/include/asm/hardirq.h:6,
>                     from include/linux/hardirq.h:8,
>                     from include/linux/interrupt.h:12,
>                     from include/linux/pci.h:31,
>                     from arch/sparc//kernel/ioport.c:36:
>    arch/sparc/include/asm/io_32.h:132:0: error: "ioremap_wt" redefined [-Werror]
>     #define ioremap_wt(X,Y)  ioremap((X),(Y))
>
>    In file included from arch/sparc/include/asm/io_32.h:13:0,
>                     from arch/sparc/include/asm/io.h:6,
>                     from include/linux/io.h:25,
>                     from include/linux/irq.h:24,
>                     from include/asm-generic/hardirq.h:12,
>                     from arch/sparc/include/asm/hardirq_32.h:10,
>                     from arch/sparc/include/asm/hardirq.h:6,
>                     from include/linux/hardirq.h:8,
>                     from include/linux/interrupt.h:12,
>                     from include/linux/pci.h:31,
>                     from arch/sparc//kernel/ioport.c:36:
>    include/asm-generic/io.h:889:0: note: this is the location of the previous definition
>     #define ioremap_wt ioremap_wt
>
>    arch/sparc//kernel/ioport.c:124:15: error: conflicting types for 'ioremap'
>     void __iomem *ioremap(unsigned long offset, unsigned long size)
>                   ^~~~~~~
>

Hi, all:

I just tried to fix this build error.
Should I send this patch next time with nds32 patchset?

--- a/arch/sparc/include/asm/io_32.h
+++ b/arch/sparc/include/asm/io_32.h
@@ -126,12 +126,7 @@ static inline void sbus_memcpy_toio(volatile void
__iomem *dst,
  * Bus number may be embedded in the higher bits of the physical address.
  * This is why we have no bus number argument to ioremap().
  */
-void __iomem *ioremap(unsigned long offset, unsigned long size);
-#define ioremap_nocache(X,Y)   ioremap((X),(Y))
-#define ioremap_wc(X,Y)                ioremap((X),(Y))
-#define ioremap_wt(X,Y)                ioremap((X),(Y))
 void iounmap(volatile void __iomem *addr);
-
 /* Create a virtual mapping cookie for an IO port range */
 void __iomem *ioport_map(unsigned long port, unsigned int nr);
 void ioport_unmap(void __iomem *);
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c
index 12894f2..9cdeb54 100644
--- a/arch/sparc/kernel/ioport.c
+++ b/arch/sparc/kernel/ioport.c
@@ -121,12 +121,12 @@ static void xres_free(struct xresource *xrp) {
  *
  * Bus type is always zero on IIep.
  */
-void __iomem *ioremap(unsigned long offset, unsigned long size)
+void __iomem *ioremap(phys_addr_t offset, size_t size)
 {
        char name[14];

        sprintf(name, "phys_%08x", (u32)offset);
-       return _sparc_alloc_io(0, offset, size, name);
+       return _sparc_alloc_io(0, (unsigned long)offset, size, name);
 }
 EXPORT_SYMBOL(ioremap);

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ