Commit 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.
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(-)
diff --git a/init/version.c b/init/version.c
index 01d4ab05f0ba..f117921811b4 100644
--- a/init/version.c
+++ b/init/version.c
@@ -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
On Sat, Nov 26, 2022 at 2:10 PM Thomas Weißschuh <[email protected]> wrote:
>
> Commit 2df8220cc511 ("kbuild: build init/built-in.a just once") moved
> the usage of the define UTS_VERSION to the file version-timestamp.c.
With s/UTS_VERSION/UTS_RELEASE/,
Reviewed-by: Masahiro Yamada <[email protected]>
>
> 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.
>
> 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(-)
>
> diff --git a/init/version.c b/init/version.c
> index 01d4ab05f0ba..f117921811b4 100644
> --- a/init/version.c
> +++ b/init/version.c
> @@ -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
>
--
Best Regards
Masahiro Yamada
On Sun, Nov 27, 2022 at 7:18 AM Masahiro Yamada <[email protected]> wrote:
>
> On Sat, Nov 26, 2022 at 2:10 PM Thomas Weißschuh <[email protected]> wrote:
> >
> > Commit 2df8220cc511 ("kbuild: build init/built-in.a just once") moved
> > the usage of the define UTS_VERSION to the file version-timestamp.c.
>
> With s/UTS_VERSION/UTS_RELEASE/,
>
>
> Reviewed-by: Masahiro Yamada <[email protected]>
>
> >
> > 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.
> >
> > 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(-)
> >
> > diff --git a/init/version.c b/init/version.c
> > index 01d4ab05f0ba..f117921811b4 100644
> > --- a/init/version.c
> > +++ b/init/version.c
> > @@ -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
> >
>
>
> --
> 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.
Fixes: 2df8220cc511 ("kbuild: build init/built-in.a just once")
Signed-off-by: Thomas Weißschuh <[email protected]>
Signed-off-by: Masahiro Yamada <[email protected]>
Applied to linux-kbuild.
Thanks.
--
Best Regards
Masahiro Yamada