* [PATCH mips-fixes 1/3] MIPS: fix indentation of the 'RELOCS' message
2020-01-17 14:02 [PATCH mips-fixes 0/3] MIPS: a set of tiny Kbuild fixes Alexander Lobakin
@ 2020-01-17 14:02 ` Alexander Lobakin
2020-01-17 14:02 ` [PATCH mips-fixes 2/3] MIPS: boot: fix typo in 'vmlinux.lzma.its' target Alexander Lobakin
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Alexander Lobakin @ 2020-01-17 14:02 UTC (permalink / raw)
To: Paul Burton
Cc: Ralf Baechle, James Hogan, Masahiro Yamada, Rob Herring,
Alexander Lobakin, linux-mips, stable, linux-kernel
quiet_cmd_relocs lacks a whitespace which results in:
LD vmlinux
SORTEX vmlinux
SYSMAP System.map
RELOCS vmlinux
Building modules, stage 2.
MODPOST 64 modules
After this patch:
LD vmlinux
SORTEX vmlinux
SYSMAP System.map
RELOCS vmlinux
Building modules, stage 2.
MODPOST 64 modules
Typo is present in kernel tree since the introduction of relocatable
kernel support in e818fac595ab ("MIPS: Generate relocation table when
CONFIG_RELOCATABLE"), but the relocation scripts were moved to
Makefile.postlink later with 44079d3509ae ("MIPS: Use Makefile.postlink
to insert relocations into vmlinux").
Fixes: 44079d3509ae ("MIPS: Use Makefile.postlink to insert relocations into vmlinux")
Cc: <stable@vger.kernel.org> # v4.11+
Signed-off-by: Alexander Lobakin <alobakin@dlink.ru>
---
arch/mips/Makefile.postlink | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/Makefile.postlink b/arch/mips/Makefile.postlink
index f03fdc95143e..4b1d3ba3a8a2 100644
--- a/arch/mips/Makefile.postlink
+++ b/arch/mips/Makefile.postlink
@@ -17,7 +17,7 @@ quiet_cmd_ls3_llsc = LLSCCHK $@
cmd_ls3_llsc = $(CMD_LS3_LLSC) $@
CMD_RELOCS = arch/mips/boot/tools/relocs
-quiet_cmd_relocs = RELOCS $@
+quiet_cmd_relocs = RELOCS $@
cmd_relocs = $(CMD_RELOCS) $@
# `@true` prevents complaint when there is nothing to be done
--
2.25.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH mips-fixes 2/3] MIPS: boot: fix typo in 'vmlinux.lzma.its' target
2020-01-17 14:02 [PATCH mips-fixes 0/3] MIPS: a set of tiny Kbuild fixes Alexander Lobakin
2020-01-17 14:02 ` [PATCH mips-fixes 1/3] MIPS: fix indentation of the 'RELOCS' message Alexander Lobakin
@ 2020-01-17 14:02 ` Alexander Lobakin
2020-01-17 14:02 ` [PATCH mips-fixes 3/3] MIPS: syscalls: fix indentation of the 'SYSNR' message Alexander Lobakin
2020-01-21 21:37 ` [PATCH mips-fixes 0/3] MIPS: a set of tiny Kbuild fixes Paul Burton
3 siblings, 0 replies; 6+ messages in thread
From: Alexander Lobakin @ 2020-01-17 14:02 UTC (permalink / raw)
To: Paul Burton
Cc: Ralf Baechle, James Hogan, Masahiro Yamada, Rob Herring,
Alexander Lobakin, linux-mips, stable, linux-kernel
Commit 92b34a976348 ("MIPS: boot: add missing targets for vmlinux.*.its")
fixed constant rebuild of *.its files on every make invokation, but due
to typo ("lzmo") it made no sense for vmlinux.lzma.its.
Fixes: 92b34a976348 ("MIPS: boot: add missing targets for vmlinux.*.its")
Cc: <stable@vger.kernel.org> # v4.19+
Signed-off-by: Alexander Lobakin <alobakin@dlink.ru>
---
arch/mips/boot/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/boot/Makefile b/arch/mips/boot/Makefile
index 528bd73d530a..4ed45ade32a1 100644
--- a/arch/mips/boot/Makefile
+++ b/arch/mips/boot/Makefile
@@ -123,7 +123,7 @@ $(obj)/vmlinux.its.S: $(addprefix $(srctree)/arch/mips/$(PLATFORM)/,$(ITS_INPUTS
targets += vmlinux.its
targets += vmlinux.gz.its
targets += vmlinux.bz2.its
-targets += vmlinux.lzmo.its
+targets += vmlinux.lzma.its
targets += vmlinux.lzo.its
quiet_cmd_cpp_its_S = ITS $@
--
2.25.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH mips-fixes 3/3] MIPS: syscalls: fix indentation of the 'SYSNR' message
2020-01-17 14:02 [PATCH mips-fixes 0/3] MIPS: a set of tiny Kbuild fixes Alexander Lobakin
2020-01-17 14:02 ` [PATCH mips-fixes 1/3] MIPS: fix indentation of the 'RELOCS' message Alexander Lobakin
2020-01-17 14:02 ` [PATCH mips-fixes 2/3] MIPS: boot: fix typo in 'vmlinux.lzma.its' target Alexander Lobakin
@ 2020-01-17 14:02 ` Alexander Lobakin
2020-01-21 21:37 ` [PATCH mips-fixes 0/3] MIPS: a set of tiny Kbuild fixes Paul Burton
3 siblings, 0 replies; 6+ messages in thread
From: Alexander Lobakin @ 2020-01-17 14:02 UTC (permalink / raw)
To: Paul Burton
Cc: Ralf Baechle, James Hogan, Masahiro Yamada, Rob Herring,
Alexander Lobakin, linux-mips, stable, linux-kernel
It also lacks a whitespace (copy'n'paste error?) and also messes up the
output:
SYSHDR arch/mips/include/generated/uapi/asm/unistd_n32.h
SYSHDR arch/mips/include/generated/uapi/asm/unistd_n64.h
SYSHDR arch/mips/include/generated/uapi/asm/unistd_o32.h
SYSNR arch/mips/include/generated/uapi/asm/unistd_nr_n32.h
SYSNR arch/mips/include/generated/uapi/asm/unistd_nr_n64.h
SYSNR arch/mips/include/generated/uapi/asm/unistd_nr_o32.h
WRAP arch/mips/include/generated/uapi/asm/bpf_perf_event.h
WRAP arch/mips/include/generated/uapi/asm/ipcbuf.h
After:
SYSHDR arch/mips/include/generated/uapi/asm/unistd_n32.h
SYSHDR arch/mips/include/generated/uapi/asm/unistd_n64.h
SYSHDR arch/mips/include/generated/uapi/asm/unistd_o32.h
SYSNR arch/mips/include/generated/uapi/asm/unistd_nr_n32.h
SYSNR arch/mips/include/generated/uapi/asm/unistd_nr_n64.h
SYSNR arch/mips/include/generated/uapi/asm/unistd_nr_o32.h
WRAP arch/mips/include/generated/uapi/asm/bpf_perf_event.h
WRAP arch/mips/include/generated/uapi/asm/ipcbuf.h
Present since day 0 of syscall table generation introduction for MIPS.
Fixes: 9bcbf97c6293 ("mips: add system call table generation support")
Cc: <stable@vger.kernel.org> # v5.0+
Signed-off-by: Alexander Lobakin <alobakin@dlink.ru>
---
arch/mips/kernel/syscalls/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/kernel/syscalls/Makefile b/arch/mips/kernel/syscalls/Makefile
index a3d4bec695c6..6efb2f6889a7 100644
--- a/arch/mips/kernel/syscalls/Makefile
+++ b/arch/mips/kernel/syscalls/Makefile
@@ -18,7 +18,7 @@ quiet_cmd_syshdr = SYSHDR $@
'$(syshdr_pfx_$(basetarget))' \
'$(syshdr_offset_$(basetarget))'
-quiet_cmd_sysnr = SYSNR $@
+quiet_cmd_sysnr = SYSNR $@
cmd_sysnr = $(CONFIG_SHELL) '$(sysnr)' '$<' '$@' \
'$(sysnr_abis_$(basetarget))' \
'$(sysnr_pfx_$(basetarget))' \
--
2.25.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH mips-fixes 0/3] MIPS: a set of tiny Kbuild fixes
2020-01-17 14:02 [PATCH mips-fixes 0/3] MIPS: a set of tiny Kbuild fixes Alexander Lobakin
` (2 preceding siblings ...)
2020-01-17 14:02 ` [PATCH mips-fixes 3/3] MIPS: syscalls: fix indentation of the 'SYSNR' message Alexander Lobakin
@ 2020-01-21 21:37 ` Paul Burton
2020-01-22 8:02 ` Alexander Lobakin
3 siblings, 1 reply; 6+ messages in thread
From: Paul Burton @ 2020-01-21 21:37 UTC (permalink / raw)
To: Alexander Lobakin
Cc: Paul Burton, Ralf Baechle, James Hogan, Masahiro Yamada,
Rob Herring, Alexander Lobakin, linux-mips, stable, linux-kernel,
linux-mips
Hello,
Alexander Lobakin wrote:
> These three fix two command output messages and a typo which leads
> to constant rebuild of vmlinux.lzma.its and all dependants on every
> make invocation.
> Nothing critical, and can be backported without manual intervention.
>
> Alexander Lobakin (3):
> MIPS: fix indentation of the 'RELOCS' message
> MIPS: boot: fix typo in 'vmlinux.lzma.its' target
> MIPS: syscalls: fix indentation of the 'SYSNR' message
>
> arch/mips/Makefile.postlink | 2 +-
> arch/mips/boot/Makefile | 2 +-
> arch/mips/kernel/syscalls/Makefile | 2 +-
Series applied to mips-next.
> MIPS: fix indentation of the 'RELOCS' message
> commit a53998802e17
> https://git.kernel.org/mips/c/a53998802e17
>
> Fixes: 44079d3509ae ("MIPS: Use Makefile.postlink to insert relocations into vmlinux")
> Signed-off-by: Alexander Lobakin <alobakin@dlink.ru>
> [paulburton@kernel.org: Fixup commit references in commit message.]
> Signed-off-by: Paul Burton <paulburton@kernel.org>
>
> MIPS: boot: fix typo in 'vmlinux.lzma.its' target
> commit 16202c09577f
> https://git.kernel.org/mips/c/16202c09577f
>
> Fixes: 92b34a976348 ("MIPS: boot: add missing targets for vmlinux.*.its")
> Signed-off-by: Alexander Lobakin <alobakin@dlink.ru>
> [paulburton@kernel.org: s/invokation/invocation/]
> Signed-off-by: Paul Burton <paulburton@kernel.org>
>
> MIPS: syscalls: fix indentation of the 'SYSNR' message
> commit 4f29ad200f7b
> https://git.kernel.org/mips/c/4f29ad200f7b
>
> Fixes: 9bcbf97c6293 ("mips: add system call table generation support")
> Signed-off-by: Alexander Lobakin <alobakin@dlink.ru>
> Signed-off-by: Paul Burton <paulburton@kernel.org>
Thanks,
Paul
[ This message was auto-generated; if you believe anything is incorrect
then please email paulburton@kernel.org to report it. ]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH mips-fixes 0/3] MIPS: a set of tiny Kbuild fixes
2020-01-21 21:37 ` [PATCH mips-fixes 0/3] MIPS: a set of tiny Kbuild fixes Paul Burton
@ 2020-01-22 8:02 ` Alexander Lobakin
0 siblings, 0 replies; 6+ messages in thread
From: Alexander Lobakin @ 2020-01-22 8:02 UTC (permalink / raw)
To: Paul Burton; +Cc: linux-mips
Paul Burton wrote 22.01.2020 00:37:
> Hello,
Hi Paul,
> Alexander Lobakin wrote:
>> These three fix two command output messages and a typo which leads
>> to constant rebuild of vmlinux.lzma.its and all dependants on every
>> make invocation.
>> Nothing critical, and can be backported without manual intervention.
>>
>> Alexander Lobakin (3):
>> MIPS: fix indentation of the 'RELOCS' message
>> MIPS: boot: fix typo in 'vmlinux.lzma.its' target
>> MIPS: syscalls: fix indentation of the 'SYSNR' message
>>
>> arch/mips/Makefile.postlink | 2 +-
>> arch/mips/boot/Makefile | 2 +-
>> arch/mips/kernel/syscalls/Makefile | 2 +-
>
> Series applied to mips-next.
>
>> MIPS: fix indentation of the 'RELOCS' message
>> commit a53998802e17
>> https://git.kernel.org/mips/c/a53998802e17
>>
>> Fixes: 44079d3509ae ("MIPS: Use Makefile.postlink to insert
>> relocations into vmlinux")
>> Signed-off-by: Alexander Lobakin <alobakin@dlink.ru>
>> [paulburton@kernel.org: Fixup commit references in commit message.]
>> Signed-off-by: Paul Burton <paulburton@kernel.org>
>>
>> MIPS: boot: fix typo in 'vmlinux.lzma.its' target
>> commit 16202c09577f
>> https://git.kernel.org/mips/c/16202c09577f
>>
>> Fixes: 92b34a976348 ("MIPS: boot: add missing targets for
>> vmlinux.*.its")
>> Signed-off-by: Alexander Lobakin <alobakin@dlink.ru>
>> [paulburton@kernel.org: s/invokation/invocation/]
Thanks for fixing these two weird issues for me, I don't know where
I was looking.
>> Signed-off-by: Paul Burton <paulburton@kernel.org>
>>
>> MIPS: syscalls: fix indentation of the 'SYSNR' message
>> commit 4f29ad200f7b
>> https://git.kernel.org/mips/c/4f29ad200f7b
>>
>> Fixes: 9bcbf97c6293 ("mips: add system call table generation
>> support")
>> Signed-off-by: Alexander Lobakin <alobakin@dlink.ru>
>> Signed-off-by: Paul Burton <paulburton@kernel.org>
>
> Thanks,
> Paul
Thank you!
> [ This message was auto-generated; if you believe anything is incorrect
> then please email paulburton@kernel.org to report it. ]
Regards,
ᚷ ᛖ ᚢ ᚦ ᚠ ᚱ
^ permalink raw reply [flat|nested] 6+ messages in thread