p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: Alexandre Belloni <alexandre.belloni@free-electrons.com>
[nicolas.ferre@atmel.com: update the paths after having re-arranged the patches]
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
This commit is contained in:
Alexandre Belloni 2015-01-22 17:19:04 +01:00 committed by Nicolas Ferre
parent bf02280e43
commit 37e9c4d947
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-at91/board-dt-rm9200.c
View File

@ -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
}; };

2
arch/arm/mach-at91/board-dt-sam9.c
View File

@ -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
}; };