ARM: make arrays containing machine compatible strings const
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Wed, 18 Feb 2015 20:01:45 +0000 (21:01 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 19 Feb 2015 08:44:17 +0000 (09:44 +0100)
commit543c5040f564c80fe59ae82a60fc061055d04a41
tree40f47351a06a1d8e54f0956803e58cdcfe09bb8a
parentd88d6cfc912e9e54f9ec0337a84691436c654077
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>
arch/arm/mach-axxia/axxia.c
arch/arm/mach-bcm/brcmstb.c
arch/arm/mach-exynos/exynos.c
arch/arm/mach-highbank/highbank.c
arch/arm/mach-hisi/hisilicon.c
arch/arm/mach-keystone/keystone.c
arch/arm/mach-nspire/nspire.c
arch/arm/mach-prima2/common.c
arch/arm/mach-s5pv210/s5pv210.c
arch/arm/mach-shmobile/setup-emev2.c
arch/arm/mach-versatile/versatile_dt.c