path: root/arch/arm/mach-keystone
diff options
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2015-02-18 21:01:45 +0100
committerArnd Bergmann <arnd@arndb.de>2015-02-19 09:44:17 +0100
commit543c5040f564c80fe59ae82a60fc061055d04a41 (patch)
tree40f47351a06a1d8e54f0956803e58cdcfe09bb8a /arch/arm/mach-keystone
parentd88d6cfc912e9e54f9ec0337a84691436c654077 (diff)
ARM: make arrays containing machine compatible strings const
The definition static const char *axxia_dt_match[] __initconst = { ... defines a changable array of constant strings. That is you must not do: *axxia_dt_match[0] = 'k'; but axxia_dt_match[0] = "different string"; is fine. So the annotation __initconst is wrong and yields a compiler error when other really const variables are added with __initconst. As the struct machine_desc member dt_compat is declared as const char *const *dt_compat; making the arrays const is the better alternative over changing all annotations to __initdata. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-keystone')
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
index 7f352de26099..06620875813a 100644
--- a/arch/arm/mach-keystone/keystone.c
+++ b/arch/arm/mach-keystone/keystone.c
@@ -103,7 +103,7 @@ static void __init keystone_init_meminfo(void)
pr_info("Switching to high address space at 0x%llx\n", (u64)offset);
-static const char *keystone_match[] __initconst = {
+static const char *const keystone_match[] __initconst = {