diff options
| author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2015-01-22 17:19:04 +0100 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2015-01-26 13:43:33 +0100 |
| commit | 37e9c4d947dedd74d6ce1488a3baac42349b7323 (patch) | |
| tree | 09a095e3463908758fe7b9ba6df3007a65dc5ac8 /arch/arm/mach-at91 | |
| parent | bf02280e435cb620b255bb03738ac334cb7233dd (diff) | |
| download | blackbird-obmc-linux-37e9c4d947dedd74d6ce1488a3baac42349b7323.tar.gz blackbird-obmc-linux-37e9c4d947dedd74d6ce1488a3baac42349b7323.zip | |
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>
Diffstat (limited to 'arch/arm/mach-at91')
| -rw-r--r-- | arch/arm/mach-at91/board-dt-rm9200.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/board-dt-sam9.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/board-dt-rm9200.c b/arch/arm/mach-at91/board-dt-rm9200.c index 5f82a65153e1..0455c96d32b1 100644 --- a/arch/arm/mach-at91/board-dt-rm9200.c +++ b/arch/arm/mach-at91/board-dt-rm9200.c @@ -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", NULL }; diff --git a/arch/arm/mach-at91/board-dt-sam9.c b/arch/arm/mach-at91/board-dt-sam9.c index c8252ddac6f0..a648d090d74a 100644 --- a/arch/arm/mach-at91/board-dt-sam9.c +++ b/arch/arm/mach-at91/board-dt-sam9.c @@ -30,7 +30,7 @@ static void __init sam9_dt_device_init(void) 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", NULL }; |
