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>
git-mirror · Jan 26, 2015 · 37e9c4d · 37e9c4d
1 parent bf02280
commit 37e9c4d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -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
     };
@@ Expand Down @@