summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/sama5.c
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2015-07-28 00:27:52 +0200
committerOlof Johansson <olof@lixom.net>2015-07-28 13:55:27 +0200
commit19c233b79d1af7b5af1ec68c1172848648184449 (patch)
tree72f3f43b983202fdc3483f803778e3d7c2f457c0 /arch/arm/mach-at91/sama5.c
parentMerge tag 'renesas-cleanup2-for-v4.3' of git://git.kernel.org/pub/scm/linux/k... (diff)
downloadlinux-19c233b79d1af7b5af1ec68c1172848648184449.tar.xz
linux-19c233b79d1af7b5af1ec68c1172848648184449.zip
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-at91/sama5.c')
-rw-r--r--arch/arm/mach-at91/sama5.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/sama5.c b/arch/arm/mach-at91/sama5.c
index 41d829d8e7d5..8fc47630bbc8 100644
--- a/arch/arm/mach-at91/sama5.c
+++ b/arch/arm/mach-at91/sama5.c
@@ -52,7 +52,7 @@ static void __init sama5_dt_device_init(void)
at91sam9x5_pm_init();
}
-static const char *sama5_dt_board_compat[] __initconst = {
+static const char *const sama5_dt_board_compat[] __initconst = {
"atmel,sama5",
NULL
};
@@ -63,7 +63,7 @@ DT_MACHINE_START(sama5_dt, "Atmel SAMA5")
.dt_compat = sama5_dt_board_compat,
MACHINE_END
-static const char *sama5_alt_dt_board_compat[] __initconst = {
+static const char *const sama5_alt_dt_board_compat[] __initconst = {
"atmel,sama5d4",
NULL
};