Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19c233b7 authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Olof Johansson
Browse files

ARM: appropriate __init annotation for const data 



Init data marked const should be annotated with __initconst for
correctness and not __initdata.  In some cases the array gathering
references to that data has to be marked const as well. This fixes
LTO builds that otherwise fail with section mismatch errors.

Signed-off-by: default avatarNicolas Pitre <nico@linaro.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent a1156814

arch/arm/kernel/psci.c

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ static int psci_0_1_init(struct device_node *np) 
	return err;

}



static const struct of_device_id psci_of_match[] __initconst = {

static const struct of_device_id const psci_of_match[] __initconst = {

	{ .compatible = "arm,psci", .data = psci_0_1_init},

	{ .compatible = "arm,psci-0.2", .data = psci_0_2_init},

	{},

arch/arm/mach-at91/at91rm9200.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static void __init at91rm9200_dt_device_init(void) 
	at91rm9200_pm_init();

}



static const char *at91rm9200_dt_board_compat[] __initconst = {

static const char *const at91rm9200_dt_board_compat[] __initconst = {

	"atmel,at91rm9200",

	NULL

};

arch/arm/mach-at91/at91sam9.c

+3 −3
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static void __init at91sam9_dt_device_init(void) 
	at91sam9260_pm_init();

}



static const char *at91_dt_board_compat[] __initconst = {

static const char *const at91_dt_board_compat[] __initconst = {

	"atmel,at91sam9",

	NULL

};
@@ -89,7 +89,7 @@ static void __init at91sam9g45_dt_device_init(void) 
	at91sam9g45_pm_init();

}



static const char *at91sam9g45_board_compat[] __initconst = {

static const char *const at91sam9g45_board_compat[] __initconst = {

	"atmel,at91sam9g45",

	NULL

};
@@ -106,7 +106,7 @@ static void __init at91sam9x5_dt_device_init(void) 
	at91sam9x5_pm_init();

}



static const char *at91sam9x5_board_compat[] __initconst = {

static const char *const at91sam9x5_board_compat[] __initconst = {

	"atmel,at91sam9x5",

	"atmel,at91sam9n12",

	NULL

arch/arm/mach-at91/pm.c

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ static void at91sam9_sdram_standby(void) 
		at91_ramc_write(1, AT91_SDRAMC_LPR, saved_lpr1);

}



static const struct of_device_id ramc_ids[] __initconst = {

static const struct of_device_id const ramc_ids[] __initconst = {

	{ .compatible = "atmel,at91rm9200-sdramc", .data = at91rm9200_standby },

	{ .compatible = "atmel,at91sam9260-sdramc", .data = at91sam9_sdram_standby },

	{ .compatible = "atmel,at91sam9g45-ddramc", .data = at91_ddr_standby },

arch/arm/mach-at91/sama5.c

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static void __init sama5_dt_device_init(void) 
	at91sam9x5_pm_init();

}



static const char *sama5_dt_board_compat[] __initconst = {

static const char *const sama5_dt_board_compat[] __initconst = {

	"atmel,sama5",

	NULL

};
@@ -63,7 +63,7 @@ DT_MACHINE_START(sama5_dt, "Atmel SAMA5") 
	.dt_compat	= sama5_dt_board_compat,

MACHINE_END



static const char *sama5_alt_dt_board_compat[] __initconst = {

static const char *const sama5_alt_dt_board_compat[] __initconst = {

	"atmel,sama5d4",

	NULL

};