[PATCH v2] ARM: appropriate __init annotation for const data

[Fabio Estevam]

On Mon, Jul 27, 2015 at 6:15 PM, Nicolas Pitre <nicolas.pitre at linaro.org> wrote:
>
> Init data marked const should be annotated with __initconst for

> diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
> index 2e7cec86e5..1063af930d 100644
> --- a/arch/arm/mach-mxs/mach-mxs.c
> +++ b/arch/arm/mach-mxs/mach-mxs.c
> @@ -282,7 +282,7 @@ static void __init apx4devkit_init(void)
>  #define TX28_FEC_PHY_RESET     MXS_GPIO_NR(4, 13)
>  #define TX28_FEC_nINT          MXS_GPIO_NR(4, 5)
>
> -static const struct gpio tx28_gpios[] __initconst = {
> +static const struct gpio const tx28_gpios[] __initconst = {
>         { ENET0_MDC__GPIO_4_0, GPIOF_OUT_INIT_LOW, "GPIO_4_0" },
>         { ENET0_MDIO__GPIO_4_1, GPIOF_OUT_INIT_LOW, "GPIO_4_1" },
>         { ENET0_RX_EN__GPIO_4_2, GPIOF_OUT_INIT_LOW, "GPIO_4_2" },
> @@ -528,7 +528,7 @@ static void mxs_restart(enum reboot_mode mode, const char *cmd)
>         soft_restart(0);
>  }
>
> -static const char *mxs_dt_compat[] __initdata = {
> +static const char *mxs_dt_compat[] __initconst = {
>         "fsl,imx28",
>         "fsl,imx23",
>         NULL,

Still gives me error on mxs_defconfig:

  CC      arch/arm/mach-mxs/mach-mxs.o
arch/arm/mach-mxs/mach-mxs.c:531:20: error: mxs_dt_compat causes a
section type conflict with tx28_gpios
arch/arm/mach-mxs/mach-mxs.c:285:32: note: ‘tx28_gpios’ was declared here