summaryrefslogtreecommitdiff
path: root/arch/arm/mach-davinci/da8xx-dt.c
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2015-07-28 01:27:52 +0300
committerOlof Johansson <olof@lixom.net>2015-07-28 14:55:27 +0300
commit19c233b79d1af7b5af1ec68c1172848648184449 (patch)
tree72f3f43b983202fdc3483f803778e3d7c2f457c0 /arch/arm/mach-davinci/da8xx-dt.c
parenta1156814606c0bd5f8725ff7feac21e58bc3b16d (diff)
downloadlinux-19c233b79d1af7b5af1ec68c1172848648184449.tar.xz
ARM: appropriate __init annotation for const data
Init data marked const should be annotated with __initconst for correctness and not __initdata. In some cases the array gathering references to that data has to be marked const as well. This fixes LTO builds that otherwise fail with section mismatch errors. Signed-off-by: Nicolas Pitre <nico@linaro.org> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-davinci/da8xx-dt.c')
-rw-r--r--arch/arm/mach-davinci/da8xx-dt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c
index 438f68547f4c..06b6451225c1 100644
--- a/arch/arm/mach-davinci/da8xx-dt.c
+++ b/arch/arm/mach-davinci/da8xx-dt.c
@@ -20,7 +20,7 @@
#define DA8XX_NUM_UARTS 3
-static const struct of_device_id da8xx_irq_match[] __initconst = {
+static const struct of_device_id const da8xx_irq_match[] __initconst = {
{ .compatible = "ti,cp-intc", .data = cp_intc_of_init, },
{ }
};
@@ -59,7 +59,7 @@ static void __init da850_init_machine(void)
}
-static const char *da850_boards_compat[] __initdata = {
+static const char *const da850_boards_compat[] __initconst = {
"enbw,cmc",
"ti,da850-evm",
"ti,da850",