firmware_loader: remove #include <generated/utsrelease.h>
Subsystems (4)
PATCH 1/3 firmware_loader: remove #include <generated/utsrelease.h>
utsrelease.h is potentially generated on each build. By removing this unused include we can get rid of some spurious recompilations.
--- drivers/base/firmware_loader/firmware.h | 2 -- 1 file changed, 2 deletions(-)
drivers/base/firmware_loader/firmware.h +0 -2
@@ -9,8 +9,6 @@#include <linux/list.h> #include <linux/completion.h> -#include <generated/utsrelease.h> -/** * enum fw_opt - options to control firmware loading behaviour *
base-commit: 0b1dcc2cf55ae6523c6fbd0d741b3ac28c9f4536
Signature · 1 line
2.38.1
PATCH 2/3 powerpc/book3e: remove #include <generated/utsrelease.h>
Commit 7ad4bd887d27 ("powerpc/book3e: get rid of #include <generated/compile.h>") removed the usage of the define UTS_VERSION but forgot to drop the include.
--- arch/powerpc/mm/nohash/kaslr_booke.c | 1 - 1 file changed, 1 deletion(-)
arch/powerpc/mm/nohash/kaslr_booke.c +0 -1
@@ -19,7 +19,6 @@#include <asm/cacheflush.h> #include <asm/kdump.h> #include <mm/mmu_decl.h> -#include <generated/utsrelease.h> struct regions {unsigned long pa_start;
Signature · 1 line
2.38.1
Re: [PATCH 2/3] powerpc/book3e: remove #include <generated/utsrelease.h>
Le 26/11/2022 à 06:10, Thomas Weißschuh a écrit :
Quoted 3 lines
Commit
7ad4bd887d27("powerpc/book3e: get rid of #include <generated/compile.h>") removed the usage of the defineUTS_VERSIONbut forgot to drop the include.
What about:arch/powerpc/platforms/52xx/efika.carch/powerpc/platforms/amigaone/setup.carch/powerpc/platforms/chrp/setup.carch/powerpc/platforms/powermac/bootx_init.c
I believe you can do a lot more than what you did in your series.
List of files using UTS_VERSION :
$ git grep -l UTS_VERSION Documentation/kbuild/kbuild.rst arch/s390/boot/version.c arch/x86/boot/compressed/kaslr.c arch/x86/boot/version.c init/Makefile init/version-timestamp.c
List of files including generated/utsrelease.h :
$ git grep -l "#include <generated/utsrelease.h>" Documentation/target/tcm_mod_builder.py arch/alpha/boot/bootp.c arch/alpha/boot/bootpz.c arch/alpha/boot/main.c arch/powerpc/mm/nohash/kaslr_booke.c arch/powerpc/platforms/52xx/efika.c arch/powerpc/platforms/amigaone/setup.c arch/powerpc/platforms/chrp/setup.c arch/powerpc/platforms/powermac/bootx_init.c arch/s390/boot/version.c arch/x86/boot/compressed/kaslr.c arch/x86/boot/version.c crypto/fips.c drivers/auxdisplay/arm-charlcd.c drivers/auxdisplay/charlcd.c drivers/auxdisplay/line-display.c drivers/base/firmware_loader/firmware.h drivers/base/firmware_loader/main.c drivers/gpu/drm/amd/amdgpu/amdgpu_device.c drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c drivers/gpu/drm/msm/msm_gpu.c drivers/gpu/drm/vmwgfx/vmwgfx_drv.c drivers/net/bonding/bonding_priv.h drivers/net/ethernet/intel/i40e/i40e_main.c drivers/net/ethernet/intel/ice/ice_main.c drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c drivers/net/ethernet/intel/ixgbe/ixgbe_main.c drivers/net/ethernet/pensando/ionic/ionic_main.c drivers/net/ethernet/rocker/rocker_main.c drivers/net/team/team.c drivers/nvme/target/admin-cmd.c drivers/nvme/target/discovery.c drivers/power/supply/test_power.c drivers/staging/octeon/ethernet-mdio.c drivers/target/target_core_configfs.c drivers/target/tcm_fc/tfc_conf.c drivers/vhost/scsi.c drivers/xen/xen-scsiback.c include/linux/vermagic.h init/version-timestamp.c init/version.c kernel/sys.c kernel/trace/trace.c net/ethtool/ioctl.c net/rxrpc/local_event.c security/integrity/ima/ima_init.c
Christophe
Quoted 19 lines
Fixes 7ad4bd887d27 ("powerpc/book3e: get rid of #include <generated/compile.h>")Signed-off-by Thomas Weißschuh <[email protected]>--- arch/powerpc/mm/nohash/kaslr_booke.c | 1 - 1 file changed, 1 deletion(-)arch/powerpc/mm/nohash/kaslr_booke.c +0
-1@@ -19,7 +19,6 @@#include <asm/cacheflush.h> #include <asm/kdump.h> #include <mm/mmu_decl.h> -#include <generated/utsrelease.h> struct regions {unsigned long pa_start;
Re: [PATCH 2/3] powerpc/book3e: remove #include <generated/utsrelease.h>
Quoted 5 lines · Christophe Leroy
Le 26/11/2022 à 06:10, Thomas Weißschuh a écrit :
Quoted 3 lines
Commit
7ad4bd887d27("powerpc/book3e: get rid of #include <generated/compile.h>") removed the usage of the defineUTS_VERSIONbut forgot to drop the include.
Quoted 7 lines
What about:
arch/powerpc/platforms/52xx/efika.carch/powerpc/platforms/amigaone/setup.carch/powerpc/platforms/chrp/setup.carch/powerpc/platforms/powermac/bootx_init.cI believe you can do a lot more than what you did in your series.
The commit messages are wrong.
They should have said UTS_RELEASE instead of UTS_VERSION.
Could the maintainers fix this up when applying? I also changed it locally so it will be fixed for v2.
Quoted 4 lines
List of files using
UTS_VERSION:$ git grep -l UTS_VERSION [..]
Thomas
Christophe Leroy
Reviewed-byRe: [PATCH 2/3] powerpc/book3e: remove #include <generated/utsrelease.h>
Le 26/11/2022 à 15:07, Thomas Weißschuh a écrit :
Quoted 12 lines · Christophe Leroy
Quoted 11 lines
Le 26/11/2022 à 06:10, Thomas Weißschuh a écrit :
Quoted 3 lines
Commit
7ad4bd887d27("powerpc/book3e: get rid of #include <generated/compile.h>") removed the usage of the defineUTS_VERSIONbut forgot to drop the include.What about:
arch/powerpc/platforms/52xx/efika.carch/powerpc/platforms/amigaone/setup.carch/powerpc/platforms/chrp/setup.carch/powerpc/platforms/powermac/bootx_init.c
Quoted 4 lines
Quoted 1 line
I believe you can do a lot more than what you did in your series.
The commit messages are wrong.
They should have saidUTS_RELEASEinstead ofUTS_VERSION.
Ah, ok. So your series is complete then:
$ git grep -L UTS_RELEASE `git grep -l "#include <generated/utsrelease.h>"` Documentation/target/tcm_mod_builder.py arch/powerpc/mm/nohash/kaslr_booke.c drivers/base/firmware_loader/firmware.h init/version.c
Quoted 10 lines
Could the maintainers fix this up when applying? I also changed it locally so it will be fixed for v2.
Quoted 4 lines
List of files using
UTS_VERSION:$ git grep -l UTS_VERSION [..]Thomas
Michael Ellerman
reviewerRe: [PATCH 2/3] powerpc/book3e: remove #include <generated/utsrelease.h>
In reply to Thomas WeißschuhQuoted 12 lines · Thomas Weißschuh
Quoted 11 lines · Christophe Leroy
Le 26/11/2022 à 06:10, Thomas Weißschuh a écrit :
Quoted 3 lines
Commit
7ad4bd887d27("powerpc/book3e: get rid of #include <generated/compile.h>") removed the usage of the defineUTS_VERSIONbut forgot to drop the include.What about:
arch/powerpc/platforms/52xx/efika.carch/powerpc/platforms/amigaone/setup.carch/powerpc/platforms/chrp/setup.carch/powerpc/platforms/powermac/bootx_init.c
Quoted 7 lines
Quoted 1 line
I believe you can do a lot more than what you did in your series.
The commit messages are wrong.
They should have saidUTS_RELEASEinstead ofUTS_VERSION.Could the maintainers fix this up when applying? I also changed it locally so it will be fixed for v2.
I'll take this patch, but not the others.
cheers
Re: [PATCH 2/3] powerpc/book3e: remove #include <generated/utsrelease.h>
Quoted 19 lines · Michael Ellerman
Quoted 17 lines · Thomas Weißschuh
Quoted 5 lines · Christophe Leroy
Quoted 3 lines · Thomas Weißschuh
Commit
7ad4bd887d27("powerpc/book3e: get rid of #include <generated/compile.h>") removed the usage of the defineUTS_VERSIONbut forgot to drop the include.Quoted 7 lines
What about:
arch/powerpc/platforms/52xx/efika.carch/powerpc/platforms/amigaone/setup.carch/powerpc/platforms/chrp/setup.carch/powerpc/platforms/powermac/bootx_init.cI believe you can do a lot more than what you did in your series.
The commit messages are wrong.
They should have saidUTS_RELEASEinstead ofUTS_VERSION.
Quoted 6 lines
Quoted 2 lines
Could the maintainers fix this up when applying? I also changed it locally so it will be fixed for v2.
I'll take this patch, but not the others.
cheers
Okay, I applied 1/3 and 3/3 to the kbuild tree.
Signature · 2 lines
Best Regards Masahiro Yamada
Re: [PATCH 2/3] powerpc/book3e: remove #include <generated/utsrelease.h>
In reply to Thomas WeißschuhQuoted 8 lines · Thomas Weißschuh
Commit
7ad4bd887d27("powerpc/book3e: get rid of #include <generated/compile.h>") removed the usage of the defineUTS_VERSIONbut forgot to drop the include.Fixes 7ad4bd887d27 ("powerpc/book3e: get rid of #include <generated/compile.h>")Signed-off-by Thomas Weißschuh <[email protected]>---
Assuming you will fix the commit description,
Quoted 16 lines
arch/powerpc/mm/nohash/kaslr_booke.c | 1 - 1 file changed, 1 deletion(-)arch/powerpc/mm/nohash/kaslr_booke.c +0
-2@@ -19,7 +19,6 @@#include <asm/cacheflush.h> #include <asm/kdump.h> #include <mm/mmu_decl.h> -#include <generated/utsrelease.h> struct regions {unsigned long pa_start; --
Quoted 2 lines
2.38.1
--
Best Regards
Masahiro Yamada
PATCH 3/3 init/version.c: remove #include <generated/utsversion.h>
In reply to Thomas WeißschuhCommit 2df8220cc511 ("kbuild: build init/built-in.a just once") moved the usage of the define UTS_VERSION to the file version-timestamp.c.
version-timestamp.c in turn is included from version.c but already includes utsversion.h itself properly.
The unneeded include of utsversion.h from version.c can be dropped.
--- init/version.c | 1 - 1 file changed, 1 deletion(-)
init/version.c +0 -1
@@ -15,7 +15,6 @@#include <linux/printk.h> #include <linux/uts.h> #include <linux/utsname.h> -#include <generated/utsrelease.h> #include <linux/proc_ns.h> static int __init early_hostname (char *arg)
Signature · 1 line
2.38.1
Re: [PATCH 3/3] init/version.c: remove #include <generated/utsversion.h>
Quoted 3 lines · Thomas Weißschuh
Commit
2df8220cc511("kbuild: buildinit/built-in.ajust once") moved the usage of the defineUTS_VERSIONto the fileversion-timestamp.c.
With s/UTS_VERSION/UTS_RELEASE/,
Quoted 27 lines
version-timestamp.cin turn is included fromversion.cbut already includesutsversion.hitself properly.The unneeded include of
utsversion.hfromversion.ccan be dropped.Fixes 2df8220cc511 ("kbuild: build init/built-in.a just once")Signed-off-by Thomas Weißschuh <[email protected]>--- init/version.c | 1 - 1 file changed, 1 deletion(-)init/version.c +0
-2@@ -15,7 +15,6 @@#include <linux/printk.h> #include <linux/uts.h> #include <linux/utsname.h> -#include <generated/utsrelease.h> #include <linux/proc_ns.h> static int __init early_hostname (char *arg) --2.38.1
Signature · 2 lines
Best Regards Masahiro Yamada
Re: [PATCH 3/3] init/version.c: remove #include <generated/utsversion.h>
Quoted 34 lines · Masahiro Yamada
Quoted 3 lines · Thomas Weißschuh
Commit
2df8220cc511("kbuild: buildinit/built-in.ajust once") moved the usage of the defineUTS_VERSIONto the fileversion-timestamp.c.With s/UTS_VERSION/UTS_RELEASE/,
Reviewed-by Masahiro Yamada <[email protected]>Quoted 23 lines
version-timestamp.cin turn is included fromversion.cbut already includesutsversion.hitself properly.The unneeded include of
utsversion.hfromversion.ccan be dropped.Fixes 2df8220cc511 ("kbuild: build init/built-in.a just once")Signed-off-by Thomas Weißschuh <[email protected]>--- init/version.c | 1 - 1 file changed, 1 deletion(-)init/version.c +0
-1@@ -15,7 +15,6 @@#include <linux/printk.h> #include <linux/uts.h> #include <linux/utsname.h> -#include <generated/utsrelease.h> #include <linux/proc_ns.h>
Quoted 9 lines
Quoted 4 lines
init/version.c +0
-1static int __init early_hostname (char *arg) --2.38.1
--
Best Regards
Masahiro Yamada
This patch is so confusing because the subject is also wrong.
I fixed up the commit description:
init/version.c: remove #include <generated/utsrelease.h>
Commit 2df8220cc511 ("kbuild: build init/built-in.a just once") moved the usage of the define UTS_RELEASE to the file version-timestamp.c.
version-timestamp.c in turn is included from version.c but already includes utsrelease.h itself properly.
The unneeded include of utsrelease.h from version.c can be dropped.
Applied to linux-kbuild.
Thanks.
Signature · 2 lines
Best Regards Masahiro Yamada
Quoted 7 lines · Thomas Weißschuh
utsrelease.his potentially generated on each build. By removing this unused include we can get rid of some spurious recompilations.Signed-off-by Thomas Weißschuh <[email protected]>---
Quoted 21 lines
drivers/base/firmware_loader/firmware.h | 2 -- 1 file changed, 2 deletions(-)drivers/base/firmware_loader/firmware.h +0
-2@@ -9,8 +9,6 @@#include <linux/list.h> #include <linux/completion.h> -#include <generated/utsrelease.h> -/** * enum fw_opt - options to control firmware loading behaviour * base-commit:
0b1dcc2cf55ae6523c6fbd0d741b3ac28c9f4536--
2.38.1
Signature · 2 lines
Best Regards Masahiro Yamada
Quoted 3 lines · Thomas Weißschuh
utsrelease.his potentially generated on each build. By removing this unused include we can get rid of some spurious recompilations.
Quoted 20 lines
Signed-off-by Thomas Weißschuh <[email protected]>--- drivers/base/firmware_loader/firmware.h | 2 -- 1 file changed, 2 deletions(-)drivers/base/firmware_loader/firmware.h +0
-2@@ -9,8 +9,6 @@#include <linux/list.h> #include <linux/completion.h> -#include <generated/utsrelease.h> -/** * enum fw_opt - options to control firmware loading behaviour * base-commit:
0b1dcc2cf55ae6523c6fbd0d741b3ac28c9f4536
Quoted 21 lines · Russ Weight
Quoted 3 lines · Thomas Weißschuh
utsrelease.his potentially generated on each build. By removing this unused include we can get rid of some spurious recompilations.Reviewed-by Russ Weight <[email protected]>Quoted 13 lines
Signed-off-by Thomas Weißschuh <[email protected]>--- drivers/base/firmware_loader/firmware.h | 2 -- 1 file changed, 2 deletions(-)drivers/base/firmware_loader/firmware.h +0
-0@@ -9,8 +9,6 @@#include <linux/list.h> #include <linux/completion.h>
Quoted 8 lines
Quoted 7 lines
drivers/base/firmware_loader/firmware.h +0
-2-#include <generated/utsrelease.h> -/** * enum fw_opt - options to control firmware loading behaviour * base-commit:
0b1dcc2cf55ae6523c6fbd0d741b3ac28c9f4536
Applied to linux-kbuild.
Thanks.
Signature · 2 lines
Best Regards Masahiro Yamada
Michael Ellerman
AppliedRe: (subset) [PATCH 1/3] firmware_loader: remove #include <generated/utsrelease.h>
In reply to Thomas WeißschuhQuoted 5 lines · Thomas Weißschuh
utsrelease.his potentially generated on each build. By removing this unused include we can get rid of some spurious recompilations.
Applied to powerpc/next.
[2/3] powerpc/book3e: remove #include <generated/utsrelease.h>
https://git.kernel.org/powerpc/c/d5090716be6791ada9ee142163a4934c1c147aaa
cheers