2019-01-21 07:13:53

by Masahiro Yamada

[permalink] [raw]
Subject: [PATCH] MIPS: remove meaningless generic-(CONFIG_GENERIC_CSUM) += checksum.h

This line is weird in multiple ways.

(CONFIG_GENERIC_CSUM) might be a typo of $(CONFIG_GENERIC_CSUM).

Even if you add '$' to it, $(CONFIG_GENERIC_CSUM) is never evaluated
to 'y' because scripts/Makefile.asm-generic does not include
include/config/auto.conf. So, the asm-generic wrapper of checksum.h
is never generated.

Even if you manage to generate it, it is never included by anyone
because MIPS has the checkin header with the same file name:

arch/mips/include/asm/checksum.h

As you see in the top Makefile, the checkin headers are included before
generated ones.

LINUXINCLUDE := \
-I$(srctree)/arch/$(SRCARCH)/include \
-I$(objtree)/arch/$(SRCARCH)/include/generated \
...

Commit 4e0748f5beb9 ("MIPS: Use generic checksum functions for MIPS R6")
already added the asm-generic fallback code in the checkin header:

#ifdef CONFIG_GENERIC_CSUM
#include <asm/generic/checksum.h>
#else
...
#endif

Signed-off-by: Masahiro Yamada <[email protected]>
---

arch/mips/include/asm/Kbuild | 1 -
1 file changed, 1 deletion(-)

diff --git a/arch/mips/include/asm/Kbuild b/arch/mips/include/asm/Kbuild
index f15d5db..87b86cd 100644
--- a/arch/mips/include/asm/Kbuild
+++ b/arch/mips/include/asm/Kbuild
@@ -3,7 +3,6 @@ generated-y += syscall_table_32_o32.h
generated-y += syscall_table_64_n32.h
generated-y += syscall_table_64_n64.h
generated-y += syscall_table_64_o32.h
-generic-(CONFIG_GENERIC_CSUM) += checksum.h
generic-y += current.h
generic-y += device.h
generic-y += dma-contiguous.h
--
2.7.4



2019-01-21 17:45:06

by Paul Burton

[permalink] [raw]
Subject: Re: [PATCH] MIPS: remove meaningless generic-(CONFIG_GENERIC_CSUM) += checksum.h

Hi Masahiro,

On Mon, Jan 21, 2019 at 11:48:49AM +0900, Masahiro Yamada wrote:
> This line is weird in multiple ways.
>
> (CONFIG_GENERIC_CSUM) might be a typo of $(CONFIG_GENERIC_CSUM).
>
> Even if you add '$' to it, $(CONFIG_GENERIC_CSUM) is never evaluated
> to 'y' because scripts/Makefile.asm-generic does not include
> include/config/auto.conf. So, the asm-generic wrapper of checksum.h
> is never generated.
>
> Even if you manage to generate it, it is never included by anyone
> because MIPS has the checkin header with the same file name:
>
> arch/mips/include/asm/checksum.h
>
> As you see in the top Makefile, the checkin headers are included before
> generated ones.
>
> LINUXINCLUDE := \
> -I$(srctree)/arch/$(SRCARCH)/include \
> -I$(objtree)/arch/$(SRCARCH)/include/generated \
> ...
>
> Commit 4e0748f5beb9 ("MIPS: Use generic checksum functions for MIPS R6")
> already added the asm-generic fallback code in the checkin header:
>
> #ifdef CONFIG_GENERIC_CSUM
> #include <asm/generic/checksum.h>
> #else
> ...
> #endif
>
> Signed-off-by: Masahiro Yamada <[email protected]>

Good catch. Would you prefer to take this through your kbuild tree or
that I take it through the MIPS tree?

If the former:

Acked-by: Paul Burton <[email protected]>

Thanks,
Paul

2019-01-22 02:04:10

by Masahiro Yamada

[permalink] [raw]
Subject: Re: [PATCH] MIPS: remove meaningless generic-(CONFIG_GENERIC_CSUM) += checksum.h

Hi Paul,

On Tue, Jan 22, 2019 at 2:44 AM Paul Burton <[email protected]> wrote:
>
> Hi Masahiro,
>
> On Mon, Jan 21, 2019 at 11:48:49AM +0900, Masahiro Yamada wrote:
> > This line is weird in multiple ways.
> >
> > (CONFIG_GENERIC_CSUM) might be a typo of $(CONFIG_GENERIC_CSUM).
> >
> > Even if you add '$' to it, $(CONFIG_GENERIC_CSUM) is never evaluated
> > to 'y' because scripts/Makefile.asm-generic does not include
> > include/config/auto.conf. So, the asm-generic wrapper of checksum.h
> > is never generated.
> >
> > Even if you manage to generate it, it is never included by anyone
> > because MIPS has the checkin header with the same file name:
> >
> > arch/mips/include/asm/checksum.h
> >
> > As you see in the top Makefile, the checkin headers are included before
> > generated ones.
> >
> > LINUXINCLUDE := \
> > -I$(srctree)/arch/$(SRCARCH)/include \
> > -I$(objtree)/arch/$(SRCARCH)/include/generated \
> > ...
> >
> > Commit 4e0748f5beb9 ("MIPS: Use generic checksum functions for MIPS R6")
> > already added the asm-generic fallback code in the checkin header:
> >
> > #ifdef CONFIG_GENERIC_CSUM
> > #include <asm/generic/checksum.h>
> > #else
> > ...
> > #endif
> >
> > Signed-off-by: Masahiro Yamada <[email protected]>
>
> Good catch. Would you prefer to take this through your kbuild tree or
> that I take it through the MIPS tree?


Could you apply it to MIPS tree? Thanks.




--
Best Regards
Masahiro Yamada

2019-01-23 17:54:38

by Paul Burton

[permalink] [raw]
Subject: Re: [PATCH] MIPS: remove meaningless generic-(CONFIG_GENERIC_CSUM) += checksum.h

Hello,

Masahiro Yamada wrote:
> This line is weird in multiple ways.
>
> (CONFIG_GENERIC_CSUM) might be a typo of $(CONFIG_GENERIC_CSUM).
>
> Even if you add '$' to it, $(CONFIG_GENERIC_CSUM) is never evaluated
> to 'y' because scripts/Makefile.asm-generic does not include
> include/config/auto.conf. So, the asm-generic wrapper of checksum.h
> is never generated.
>
> Even if you manage to generate it, it is never included by anyone
> because MIPS has the checkin header with the same file name:
>
> arch/mips/include/asm/checksum.h
>
> As you see in the top Makefile, the checkin headers are included before
> generated ones.
>
> LINUXINCLUDE := -I$(srctree)/arch/$(SRCARCH)/include -I$(objtree)/arch/$(SRCARCH)/include/generated ...
>
> Commit 4e0748f5beb9 ("MIPS: Use generic checksum functions for MIPS R6")
> already added the asm-generic fallback code in the checkin header:
>
> #ifdef CONFIG_GENERIC_CSUM
> #include <asm/generic/checksum.h>
> #else
> ...
> #endif
>
> Signed-off-by: Masahiro Yamada <[email protected]>

Applied to mips-next.

Thanks,
Paul

[ This message was auto-generated; if you believe anything is incorrect
then please email [email protected] to report it. ]