Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 26 Jul 2023 16:37:05 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     "Paul E. McKenney" <paulmck@kernel.org>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build warning after merge of the rcu tree
Message-ID: <20230726163705.3ade6aa6@canb.auug.org.au>
In-Reply-To: <adba817d-a02b-49fb-bf3d-a22779303764@paulmck-laptop>
References: <20230726123230.525202b4@canb.auug.org.au>
        <1c8c257e-55e3-4de9-b2c8-1421c11df664@paulmck-laptop>
        <adba817d-a02b-49fb-bf3d-a22779303764@paulmck-laptop>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/8uVI3W=y2xElus3Vmk7tzQv";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/8uVI3W=y2xElus3Vmk7tzQv
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Paul,

On Tue, 25 Jul 2023 20:48:13 -0700 "Paul E. McKenney" <paulmck@kernel.org> =
wrote:
>
> Does the following incremental diff (to be squashed into the original) he=
lp?
>=20
> 							Thanx, Paul
>=20
> ------------------------------------------------------------------------
>=20
> diff --git a/init/main.c b/init/main.c
> index c946ab87783a..981170da0b1c 100644
> --- a/init/main.c
> +++ b/init/main.c
> @@ -135,7 +135,7 @@ EXPORT_SYMBOL(system_state);
>  void (*__initdata late_time_init)(void);
> =20
>  /* Untouched command line saved by arch-specific code. */
> -char __initdata boot_command_line[COMMAND_LINE_SIZE];
> +char boot_command_line[COMMAND_LINE_SIZE] __ro_after_init;
>  /* Untouched saved command line (eg. for /proc) */
>  char *saved_command_line __ro_after_init;
>  unsigned int saved_command_line_len __ro_after_init;

I needed the following (only tested x86_64 allmodconfig build):

diff --git a/include/linux/init.h b/include/linux/init.h
index 9a5973324072..e3ce68988e1b 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -112,6 +112,9 @@
 #define __REFCONST       .section       ".ref.rodata", "a"
=20
 #ifndef __ASSEMBLY__
+
+#include <linux/cache.h>
+
 /*
  * Used for initialization calls..
  */
@@ -143,7 +146,7 @@ struct file_system_type;
=20
 /* Defined in init/main.c */
 extern int do_one_initcall(initcall_t fn);
-extern char __initdata boot_command_line[];
+extern char boot_command_line[] __ro_after_init;
 extern char *saved_command_line;
 extern unsigned int saved_command_line_len;
 extern unsigned int reset_devices;
diff --git a/init/main.c b/init/main.c
index c946ab87783a..981170da0b1c 100644
--- a/init/main.c
+++ b/init/main.c
@@ -135,7 +135,7 @@ EXPORT_SYMBOL(system_state);
 void (*__initdata late_time_init)(void);
=20
 /* Untouched command line saved by arch-specific code. */
-char __initdata boot_command_line[COMMAND_LINE_SIZE];
+char boot_command_line[COMMAND_LINE_SIZE] __ro_after_init;
 /* Untouched saved command line (eg. for /proc) */
 char *saved_command_line __ro_after_init;
 unsigned int saved_command_line_len __ro_after_init;

--=20
Cheers,
Stephen Rothwell

--Sig_/8uVI3W=y2xElus3Vmk7tzQv
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmTAvxEACgkQAVBC80lX
0GzAhAf+MyI1kFZ7Cl/K/6n76b+E8QLOnpVL+mOvDBbyy1OgKEmQjjzUXovp9MdY
EWp9wRZPGBrWZb52fDqoXEnEEDNFWrr5/TAokDUlMWiCVSdcbks13OxnIEhHGJ9u
DeX8jGV/29fgWCI3Olkjo+5P7fLI2E4cA1hLVbdo5smj7Ev3q3VCDDTMfPwJpwm1
dwXNE5nRwBveXNBsNwmgEBuZ16nemStSk6xpqTFGdQFx2xuq1MoJSgVA2QAJ2lv8
f9xRVr/GyojszHXK2EFi1q6D9wGwGL0chp4TE6OhFfEa7N/eNZwzeBOeFwYvvcLL
4Gfbbg+QowbV0QY2rZDEpO6srt74jA==
=gnio
-----END PGP SIGNATURE-----

--Sig_/8uVI3W=y2xElus3Vmk7tzQv--