From: Nicolas Pitre <nicolas.pitre@linaro.org>
Date: Sun, 22 Nov 2015 01:35:31 +0000 (-0500)
Subject: mach-imx/mach-imx6ul.c: proper constness with __initconst
X-Git-Tag: v4.5-rc1~44^2~6^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d48417592583ec64ec62661dd7cf1bd342a48fc;p=thirdparty%2Flinux.git

mach-imx/mach-imx6ul.c: proper constness with __initconst

Both the pointer array and the pointed data have to be const when using
__initconst to be correct.  This also fixes LTO builds that otherwise
fail with section mismatch errors.

Signed-off-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
---

diff --git a/arch/arm/mach-imx/mach-imx6ul.c b/arch/arm/mach-imx/mach-imx6ul.c
index acaf7056efa57..a38b16b699233 100644
--- a/arch/arm/mach-imx/mach-imx6ul.c
+++ b/arch/arm/mach-imx/mach-imx6ul.c
@@ -84,7 +84,7 @@ static void __init imx6ul_init_late(void)
 		platform_device_register_simple("imx6q-cpufreq", -1, NULL, 0);
 }
 
-static const char *imx6ul_dt_compat[] __initconst = {
+static const char * const imx6ul_dt_compat[] __initconst = {
 	"fsl,imx6ul",
 	NULL,
 };