2018-02-14 22:43 GMT+08:00 Arnd Bergmann [off-list ref]:

On Tue, Feb 13, 2018 at 10:09 AM, Greentime Hu [off-list ref] wrote:

quoted

A 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 remove the #define
in io_32.h.

Also, the change adds a prototype for ioremap where size is size_t and
offset is phys_addr_t so fix that as well.

Signed-off-by: Greentime Hu <redacted>

This patch should have been addressed to the sparclinux mailing list to
the maintainers can see it, otherwise they are unlikely to notice.

Added it to Cc now.

Can you confirm that the patches are ordered correctly in your series so that
at no point, sparc is in a state that fails to be build cleanly?

If not, this may have to get merged into the other patch.

Hi, Arnd:

These 2 patch will cause sparc building error in any order.

commit af84603e339a6832052071aca1f2a16b8963cc2e
Author: Greentime Hu [off-list ref]
Date:   Tue Feb 13 17:09:07 2018 +0800

    sparc: io: To use the define of ioremap_[nocache|wc|wb] in asm-generic/io.h

    A 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 remove the #define
    in io_32.h.

    Also, the change adds a prototype for ioremap where size is size_t and
    offset is phys_addr_t so fix that as well.

    Signed-off-by: Greentime Hu [off-list ref]

commit 1995b30ea6628b261192662741940c22ac978884
Author: Greentime Hu [off-list ref]
Date:   Tue Feb 13 17:09:06 2018 +0800

    asm-generic/io.h: move
ioremap_nocache/ioremap_uc/ioremap_wc/ioremap_wt out of ifndef
CONFIG_MMU

    It allows some architectures to use this generic macro instead of
    defining theirs.

    Signed-off-by: Vincent Chen [off-list ref]
    Signed-off-by: Greentime Hu [off-list ref]
    Acked-by: Arnd Bergmann [off-list ref]

Should I merge them together like this?

asm-generic/io.h: move ioremap_nocache/ioremap_uc/ioremap_wc/ioremap_wt out of
ifndef CONFIG_MMU

It allows some architectures to use this generic macro instead of
defining theirs.

sparc: io: To use the define of ioremap_[nocache|wc|wb] in asm-generic/io.h
It will move the ioremap_nocache out of the CONFIG_MMU ifdef. This means that
in order to suppress re-definition errors we need to remove the #define
in arch/sparc/include/asm/io_32.h. Also, the change adds a prototype for
ioremap where size is size_t and offset is phys_addr_t so fix that as well.

Signed-off-by: Greentime Hu <redacted>