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>
This commit is contained in:

committed by
Arnd Bergmann

parent
d88d6cfc91
commit
543c5040f5
@@ -35,7 +35,7 @@ static void __init versatile_dt_init(void)
|
||||
versatile_auxdata_lookup, NULL);
|
||||
}
|
||||
|
||||
static const char *versatile_dt_match[] __initconst = {
|
||||
static const char *const versatile_dt_match[] __initconst = {
|
||||
"arm,versatile-ab",
|
||||
"arm,versatile-pb",
|
||||
NULL,
|
||||
|
Reference in New Issue
Block a user