Andre Przywara
2013-Aug-22 07:40 UTC
[PATCH] ARM: fix const declaration of platform struct
As Julien pointed out the other day, the data type for the platform
DT name match struct is wrong.
To be really immutable, we have to use "const char * const".
Fix it on the three currently existing platforms.
Signed-off-by: Andre Przywara <andre.przywara@linaro.org>
CC: Julien Grall <julien.grall@linaro.org>
---
xen/arch/arm/platforms/exynos5.c | 2 +-
xen/arch/arm/platforms/midway.c | 2 +-
xen/arch/arm/platforms/vexpress.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/xen/arch/arm/platforms/exynos5.c b/xen/arch/arm/platforms/exynos5.c
index 1368a04..262ded8 100644
--- a/xen/arch/arm/platforms/exynos5.c
+++ b/xen/arch/arm/platforms/exynos5.c
@@ -86,7 +86,7 @@ static uint32_t exynos5_quirks(void)
return PLATFORM_QUIRK_DOM0_MAPPING_11;
}
-static const char const *exynos5_dt_compat[] __initdata +static const char *
const exynos5_dt_compat[] __initdata {
"samsung,exynos5250",
NULL
diff --git a/xen/arch/arm/platforms/midway.c b/xen/arch/arm/platforms/midway.c
index 2d3be1b..7a3dfe1 100644
--- a/xen/arch/arm/platforms/midway.c
+++ b/xen/arch/arm/platforms/midway.c
@@ -41,7 +41,7 @@ static void midway_reset(void)
iounmap(pmu);
}
-static const char const *midway_dt_compat[] __initdata +static const char *
const midway_dt_compat[] __initdata {
"calxeda,ecx-2000",
NULL
diff --git a/xen/arch/arm/platforms/vexpress.c
b/xen/arch/arm/platforms/vexpress.c
index 8fc30c4..6f7dc2c 100644
--- a/xen/arch/arm/platforms/vexpress.c
+++ b/xen/arch/arm/platforms/vexpress.c
@@ -119,7 +119,7 @@ static void vexpress_reset(void)
iounmap(sp810);
}
-static const char const *vexpress_dt_compat[] __initdata +static const char *
const vexpress_dt_compat[] __initdata {
"arm,vexpress",
NULL
--
1.7.12.1
Ian Campbell
2013-Aug-22 12:56 UTC
Re: [PATCH] ARM: fix const declaration of platform struct
On Thu, 2013-08-22 at 09:40 +0200, Andre Przywara wrote:> As Julien pointed out the other day, the data type for the platform > DT name match struct is wrong. > To be really immutable, we have to use "const char * const". > > Fix it on the three currently existing platforms. > > Signed-off-by: Andre Przywara <andre.przywara@linaro.org> > CC: Julien Grall <julien.grall@linaro.org>Acked + applied, thanks.