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

Commit 37e9c4d9 authored by Alexandre Belloni's avatar Alexandre Belloni Committed by Nicolas Ferre
Browse files

ARM: at91: mark const init data with __initconst instead of __initdata 



As long as there is no other non-const variable marked __initdata in the
same compilation unit it doesn't hurt. If there were one however
compilation would fail with

error: $variablename causes a section type conflict

because a section containing const variables is marked read only and so
cannot contain non-const variables.

Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
[nicolas.ferre@atmel.com: update the paths after having re-arranged the patches]
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent bf02280e

arch/arm/mach-at91/board-dt-rm9200.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -40,7 +40,7 @@ static void __init rm9200_dt_device_init(void) 












static const char *at91rm9200_dt_board_compat[] __initdata = {

static const char *at91rm9200_dt_board_compat[] __initconst = {

	"atmel,at91rm9200",

	"atmel,at91rm9200",

	NULL

	NULL

};

};

arch/arm/mach-at91/board-dt-sam9.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -30,7 +30,7 @@ static void __init sam9_dt_device_init(void) 
	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}

}





static const char *at91_dt_board_compat[] __initdata = {

static const char *at91_dt_board_compat[] __initconst = {

	"atmel,at91sam9",

	"atmel,at91sam9",

	NULL

	NULL

};

};