diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2015-07-27 18:27:52 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-07-28 13:55:27 +0200 |
| commit | 19c233b79d1af7b5af1ec68c1172848648184449 (patch) | |
| tree | 72f3f43b983202fdc3483f803778e3d7c2f457c0 /arch/arm/mach-mmp | |
| parent | a1156814606c0bd5f8725ff7feac21e58bc3b16d (diff) | |
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-mmp')
| -rw-r--r-- | arch/arm/mach-mmp/mmp-dt.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-mmp/mmp2-dt.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-mmp/mmp-dt.c b/arch/arm/mach-mmp/mmp-dt.c index b2296c9309b8..6e155f03b83c 100644 --- a/arch/arm/mach-mmp/mmp-dt.c +++ b/arch/arm/mach-mmp/mmp-dt.c @@ -20,12 +20,12 @@ extern void __init mmp_dt_init_timer(void); -static const char *pxa168_dt_board_compat[] __initdata = { +static const char *const pxa168_dt_board_compat[] __initconst = { "mrvl,pxa168-aspenite", NULL, }; -static const char *pxa910_dt_board_compat[] __initdata = { +static const char *const pxa910_dt_board_compat[] __initconst = { "mrvl,pxa910-dkb", NULL, }; diff --git a/arch/arm/mach-mmp/mmp2-dt.c b/arch/arm/mach-mmp/mmp2-dt.c index 998c0f533abc..0341359b24a4 100644 --- a/arch/arm/mach-mmp/mmp2-dt.c +++ b/arch/arm/mach-mmp/mmp2-dt.c @@ -30,7 +30,7 @@ static void __init mmp_init_time(void) of_clk_init(NULL); } -static const char *mmp2_dt_board_compat[] __initdata = { +static const char *const mmp2_dt_board_compat[] __initconst = { "mrvl,mmp2-brownstone", NULL, }; |