ARM: make of_device_ids const

of_device_ids (i.e. compatible strings and the respective data) are not
supposed to change at runtime. All functions working with of_device_ids
provided by <linux/of.h> work with const of_device_ids. So mark the
non-const structs in arch/arm as const, too.

While at it also add some __initconst annotations.

Acked-by: Jason Cooper <jason@lakedameon.net>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/kernel/perf_event_cpu.c b/arch/arm/kernel/perf_event_cpu.c
index dd9acc9..61b53c4 100644 (file)
--- a/arch/arm/kernel/perf_event_cpu.c
+++ b/arch/arm/kernel/perf_event_cpu.c
@@ -231,7 +231,7 @@ static void cpu_pmu_destroy(struct arm_pmu *cpu_pmu)
 /*
  * PMU platform driver and devicetree bindings.
  */
-static struct of_device_id cpu_pmu_of_device_ids[] = {
+static const struct of_device_id cpu_pmu_of_device_ids[] = {
        {.compatible = "arm,cortex-a17-pmu",    .data = armv7_a17_pmu_init},
        {.compatible = "arm,cortex-a15-pmu",    .data = armv7_a15_pmu_init},
        {.compatible = "arm,cortex-a12-pmu",    .data = armv7_a12_pmu_init},

diff --cc arch/arm/mach-at91/at91rm9200_time.c
Simple merge

diff --cc arch/arm/mach-at91/pm.c
Simple merge

diff --cc arch/arm/mach-davinci/da8xx-dt.c
Simple merge

diff --cc arch/arm/mach-exynos/suspend.c
Simple merge

diff --cc arch/arm/mach-imx/mmdc.c
Simple merge

diff --cc arch/arm/mach-keystone/pm_domain.c
Simple merge

diff --cc arch/arm/mach-mmp/time.c
Simple merge

diff --cc arch/arm/mach-mvebu/coherency.c
Simple merge

diff --cc arch/arm/mach-mvebu/pmsu.c
Simple merge

diff --cc arch/arm/mach-omap2/omap4-common.c
Simple merge

diff --cc arch/arm/mach-omap2/prm3xxx.c
Simple merge

diff --cc arch/arm/mach-omap2/prm44xx.c
Simple merge

diff --cc arch/arm/mach-prima2/platsmp.c
Simple merge

diff --cc arch/arm/mach-ux500/pm_domains.c
Simple merge