Skip to content

Commit 7530527

Browse files
masahir0yarndb
masahir0y
authored and
arndb
committed
ARM: use const and __initconst for smp_operations
These smp_operations structures are not over-written, so add "const" qualifier and replace __initdata with __initconst. Also, add "static" where it is possible. Signed-off-by: Masahiro Yamada <[email protected]> Acked-by: Krzysztof Kozlowski <[email protected]> Acked-by: Maxime Ripard <[email protected]> Acked-by: Moritz Fischer <[email protected]> Acked-by: Stephen Boyd <[email protected]> # qcom part Acked-by: Viresh Kumar <[email protected]> Acked-by: Patrice Chotard <[email protected]> Acked-by: Heiko Stuebner <[email protected]> Acked-by: Wei Xu <[email protected]> Acked-by: Florian Fainelli <[email protected]> Acked-by: Sebastian Hesselbarth <[email protected]> Acked-by: Gregory CLEMENT <[email protected]> Acked-by: Shawn Guo <[email protected]> Acked-by: Matthias Brugger <[email protected]> Acked-by: Thierry Reding <[email protected]> Acked-by: Nicolas Pitre <[email protected]> Acked-by: Liviu Dudau <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
1 parent 635e958 commit 7530527

File tree

54 files changed

+64
-64
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+64
-64
lines changed

‎arch/arm/common/mcpm_platsmp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ static void mcpm_cpu_die(unsigned int cpu)
8383

8484
#endif
8585

86-
static struct smp_operations __initdata mcpm_smp_ops = {
86+
static const struct smp_operations mcpm_smp_ops __initconst = {
8787
.smp_boot_secondary = mcpm_boot_secondary,
8888
.smp_secondary_init = mcpm_secondary_init,
8989
#ifdef CONFIG_HOTPLUG_CPU

‎arch/arm/include/asm/psci.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#ifndef __ASM_ARM_PSCI_H
1515
#define __ASM_ARM_PSCI_H
1616

17-
extern struct smp_operations psci_smp_ops;
17+
extern const struct smp_operations psci_smp_ops;
1818

1919
#ifdef CONFIG_ARM_PSCI
2020
bool psci_smp_available(void);

‎arch/arm/kernel/psci_smp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ bool __init psci_smp_available(void)
120120
return (psci_ops.cpu_on != NULL);
121121
}
122122

123-
struct smp_operations __initdata psci_smp_ops = {
123+
const struct smp_operations psci_smp_ops __initconst = {
124124
.smp_boot_secondary = psci_boot_secondary,
125125
#ifdef CONFIG_HOTPLUG_CPU
126126
.cpu_disable = psci_cpu_disable,

‎arch/arm/mach-alpine/platsmp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ static void __init alpine_smp_prepare_cpus(unsigned int max_cpus)
4242
alpine_cpu_pm_init();
4343
}
4444

45-
static struct smp_operations alpine_smp_ops __initdata = {
45+
static const struct smp_operations alpine_smp_ops __initconst = {
4646
.smp_prepare_cpus = alpine_smp_prepare_cpus,
4747
.smp_boot_secondary = alpine_boot_secondary,
4848
};

‎arch/arm/mach-axxia/platsmp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ static void __init axxia_smp_prepare_cpus(unsigned int max_cpus)
8282
}
8383
}
8484

85-
static struct smp_operations axxia_smp_ops __initdata = {
85+
static const struct smp_operations axxia_smp_ops __initconst = {
8686
.smp_prepare_cpus = axxia_smp_prepare_cpus,
8787
.smp_boot_secondary = axxia_boot_secondary,
8888
};

‎arch/arm/mach-bcm/bcm63xx_smp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ static void __init bcm63138_smp_prepare_cpus(unsigned int max_cpus)
161161
}
162162
}
163163

164-
struct smp_operations bcm63138_smp_ops __initdata = {
164+
static const struct smp_operations bcm63138_smp_ops __initconst = {
165165
.smp_prepare_cpus = bcm63138_smp_prepare_cpus,
166166
.smp_boot_secondary = bcm63138_smp_boot_secondary,
167167
};

‎arch/arm/mach-bcm/kona_smp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ static int bcm_boot_secondary(unsigned int cpu, struct task_struct *idle)
194194
return -ENOSYS;
195195
}
196196

197-
static struct smp_operations bcm_smp_ops __initdata = {
197+
static const struct smp_operations bcm_smp_ops __initconst = {
198198
.smp_prepare_cpus = bcm_smp_prepare_cpus,
199199
.smp_boot_secondary = bcm_boot_secondary,
200200
};

‎arch/arm/mach-bcm/platsmp-brcmstb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ static int brcmstb_boot_secondary(unsigned int cpu, struct task_struct *idle)
356356
return 0;
357357
}
358358

359-
static struct smp_operations brcmstb_smp_ops __initdata = {
359+
static const struct smp_operations brcmstb_smp_ops __initconst = {
360360
.smp_prepare_cpus = brcmstb_cpu_ctrl_setup,
361361
.smp_boot_secondary = brcmstb_boot_secondary,
362362
#ifdef CONFIG_HOTPLUG_CPU

‎arch/arm/mach-berlin/platsmp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ static int berlin_cpu_kill(unsigned int cpu)
119119
}
120120
#endif
121121

122-
static struct smp_operations berlin_smp_ops __initdata = {
122+
static const struct smp_operations berlin_smp_ops __initconst = {
123123
.smp_prepare_cpus = berlin_smp_prepare_cpus,
124124
.smp_boot_secondary = berlin_boot_secondary,
125125
#ifdef CONFIG_HOTPLUG_CPU

‎arch/arm/mach-exynos/common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ static inline void exynos_pm_init(void) {}
149149
extern void exynos_cpu_resume(void);
150150
extern void exynos_cpu_resume_ns(void);
151151

152-
extern struct smp_operations exynos_smp_ops;
152+
extern const struct smp_operations exynos_smp_ops;
153153

154154
extern void exynos_cpu_power_down(int cpu);
155155
extern void exynos_cpu_power_up(int cpu);

‎arch/arm/mach-exynos/platsmp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ static void exynos_cpu_die(unsigned int cpu)
479479
}
480480
#endif /* CONFIG_HOTPLUG_CPU */
481481

482-
struct smp_operations exynos_smp_ops __initdata = {
482+
const struct smp_operations exynos_smp_ops __initconst = {
483483
.smp_init_cpus = exynos_smp_init_cpus,
484484
.smp_prepare_cpus = exynos_smp_prepare_cpus,
485485
.smp_secondary_init = exynos_secondary_init,

‎arch/arm/mach-hisi/platmcpm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ static int hip04_cpu_kill(unsigned int l_cpu)
239239
}
240240
#endif
241241

242-
static struct smp_operations __initdata hip04_smp_ops = {
242+
static const struct smp_operations hip04_smp_ops __initconst = {
243243
.smp_boot_secondary = hip04_boot_secondary,
244244
#ifdef CONFIG_HOTPLUG_CPU
245245
.cpu_die = hip04_cpu_die,

‎arch/arm/mach-hisi/platsmp.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ static int hi3xxx_boot_secondary(unsigned int cpu, struct task_struct *idle)
8989
return 0;
9090
}
9191

92-
static struct smp_operations hi3xxx_smp_ops __initdata = {
92+
static const struct smp_operations hi3xxx_smp_ops __initconst = {
9393
.smp_prepare_cpus = hi3xxx_smp_prepare_cpus,
9494
.smp_boot_secondary = hi3xxx_boot_secondary,
9595
#ifdef CONFIG_HOTPLUG_CPU
@@ -126,7 +126,7 @@ static int hix5hd2_boot_secondary(unsigned int cpu, struct task_struct *idle)
126126
}
127127

128128

129-
static struct smp_operations hix5hd2_smp_ops __initdata = {
129+
static const struct smp_operations hix5hd2_smp_ops __initconst = {
130130
.smp_prepare_cpus = hisi_common_smp_prepare_cpus,
131131
.smp_boot_secondary = hix5hd2_boot_secondary,
132132
#ifdef CONFIG_HOTPLUG_CPU
@@ -176,7 +176,7 @@ static int hip01_boot_secondary(unsigned int cpu, struct task_struct *idle)
176176
return 0;
177177
}
178178

179-
static struct smp_operations hip01_smp_ops __initdata = {
179+
static const struct smp_operations hip01_smp_ops __initconst = {
180180
.smp_prepare_cpus = hisi_common_smp_prepare_cpus,
181181
.smp_boot_secondary = hip01_boot_secondary,
182182
};

‎arch/arm/mach-imx/common.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ void imx_init_l2cache(void);
153153
static inline void imx_init_l2cache(void) {}
154154
#endif
155155

156-
extern struct smp_operations imx_smp_ops;
157-
extern struct smp_operations ls1021a_smp_ops;
156+
extern const struct smp_operations imx_smp_ops;
157+
extern const struct smp_operations ls1021a_smp_ops;
158158

159159
#endif

‎arch/arm/mach-imx/platsmp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ static void __init imx_smp_prepare_cpus(unsigned int max_cpus)
8888
sync_cache_w(&g_diag_reg);
8989
}
9090

91-
struct smp_operations imx_smp_ops __initdata = {
91+
const struct smp_operations imx_smp_ops __initconst = {
9292
.smp_init_cpus = imx_smp_init_cpus,
9393
.smp_prepare_cpus = imx_smp_prepare_cpus,
9494
.smp_boot_secondary = imx_boot_secondary,
@@ -123,7 +123,7 @@ static void __init ls1021a_smp_prepare_cpus(unsigned int max_cpus)
123123
iounmap(dcfg_base);
124124
}
125125

126-
struct smp_operations ls1021a_smp_ops __initdata = {
126+
const struct smp_operations ls1021a_smp_ops __initconst = {
127127
.smp_prepare_cpus = ls1021a_smp_prepare_cpus,
128128
.smp_boot_secondary = ls1021a_boot_secondary,
129129
};

‎arch/arm/mach-keystone/keystone.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
#ifndef __ASSEMBLER__
1717

18-
extern struct smp_operations keystone_smp_ops;
18+
extern const struct smp_operations keystone_smp_ops;
1919
extern void secondary_startup(void);
2020
extern u32 keystone_cpu_smc(u32 command, u32 cpu, u32 addr);
2121
extern int keystone_pm_runtime_init(void);

‎arch/arm/mach-keystone/platsmp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ static int keystone_smp_boot_secondary(unsigned int cpu,
3939
return error;
4040
}
4141

42-
struct smp_operations keystone_smp_ops __initdata = {
42+
const struct smp_operations keystone_smp_ops __initconst = {
4343
.smp_boot_secondary = keystone_smp_boot_secondary,
4444
};

‎arch/arm/mach-mediatek/platsmp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,13 +128,13 @@ static void __init mtk_smp_prepare_cpus(unsigned int max_cpus)
128128
__mtk_smp_prepare_cpus(max_cpus, 0);
129129
}
130130

131-
static struct smp_operations mt81xx_tz_smp_ops __initdata = {
131+
static const struct smp_operations mt81xx_tz_smp_ops __initconst = {
132132
.smp_prepare_cpus = mtk_tz_smp_prepare_cpus,
133133
.smp_boot_secondary = mtk_boot_secondary,
134134
};
135135
CPU_METHOD_OF_DECLARE(mt81xx_tz_smp, "mediatek,mt81xx-tz-smp", &mt81xx_tz_smp_ops);
136136

137-
static struct smp_operations mt6589_smp_ops __initdata = {
137+
static const struct smp_operations mt6589_smp_ops __initconst = {
138138
.smp_prepare_cpus = mtk_smp_prepare_cpus,
139139
.smp_boot_secondary = mtk_boot_secondary,
140140
};

‎arch/arm/mach-mvebu/armada-370-xp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#ifdef CONFIG_SMP
1919
void armada_xp_secondary_startup(void);
20-
extern struct smp_operations armada_xp_smp_ops;
20+
extern const struct smp_operations armada_xp_smp_ops;
2121
#endif
2222

2323
#endif /* __MACH_ARMADA_370_XP_H */

‎arch/arm/mach-mvebu/platsmp-a9.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@ static int armada_38x_cpu_kill(unsigned int cpu)
9393
}
9494
#endif
9595

96-
static struct smp_operations mvebu_cortex_a9_smp_ops __initdata = {
96+
static const struct smp_operations mvebu_cortex_a9_smp_ops __initconst = {
9797
.smp_boot_secondary = mvebu_cortex_a9_boot_secondary,
9898
};
9999

100-
static struct smp_operations armada_38x_smp_ops __initdata = {
100+
static const struct smp_operations armada_38x_smp_ops __initconst = {
101101
.smp_boot_secondary = mvebu_cortex_a9_boot_secondary,
102102
.smp_secondary_init = armada_38x_secondary_init,
103103
#ifdef CONFIG_HOTPLUG_CPU

‎arch/arm/mach-mvebu/platsmp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ static int armada_xp_cpu_kill(unsigned int cpu)
170170
}
171171
#endif
172172

173-
struct smp_operations armada_xp_smp_ops __initdata = {
173+
const struct smp_operations armada_xp_smp_ops __initconst = {
174174
.smp_init_cpus = armada_xp_smp_init_cpus,
175175
.smp_prepare_cpus = armada_xp_smp_prepare_cpus,
176176
.smp_boot_secondary = armada_xp_boot_secondary,

‎arch/arm/mach-omap2/common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ extern u32 omap_read_auxcoreboot0(void);
270270

271271
extern void omap4_cpu_die(unsigned int cpu);
272272

273-
extern struct smp_operations omap4_smp_ops;
273+
extern const struct smp_operations omap4_smp_ops;
274274

275275
extern void omap5_secondary_startup(void);
276276
extern void omap5_secondary_hyp_startup(void);

‎arch/arm/mach-omap2/omap-smp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ static void __init omap4_smp_prepare_cpus(unsigned int max_cpus)
241241

242242
}
243243

244-
struct smp_operations omap4_smp_ops __initdata = {
244+
const struct smp_operations omap4_smp_ops __initconst = {
245245
.smp_init_cpus = omap4_smp_init_cpus,
246246
.smp_prepare_cpus = omap4_smp_prepare_cpus,
247247
.smp_secondary_init = omap4_secondary_init,

‎arch/arm/mach-prima2/common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <asm/mach/time.h>
1616
#include <asm/exception.h>
1717

18-
extern struct smp_operations sirfsoc_smp_ops;
18+
extern const struct smp_operations sirfsoc_smp_ops;
1919
extern void sirfsoc_secondary_startup(void);
2020
extern void sirfsoc_cpu_die(unsigned int cpu);
2121

‎arch/arm/mach-prima2/platsmp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ static int sirfsoc_boot_secondary(unsigned int cpu, struct task_struct *idle)
112112
return pen_release != -1 ? -ENOSYS : 0;
113113
}
114114

115-
struct smp_operations sirfsoc_smp_ops __initdata = {
115+
const struct smp_operations sirfsoc_smp_ops __initconst = {
116116
.smp_secondary_init = sirfsoc_secondary_init,
117117
.smp_boot_secondary = sirfsoc_boot_secondary,
118118
#ifdef CONFIG_HOTPLUG_CPU

‎arch/arm/mach-qcom/platsmp.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ static void __init qcom_smp_prepare_cpus(unsigned int max_cpus)
332332
}
333333
}
334334

335-
static struct smp_operations smp_msm8660_ops __initdata = {
335+
static const struct smp_operations smp_msm8660_ops __initconst = {
336336
.smp_prepare_cpus = qcom_smp_prepare_cpus,
337337
.smp_secondary_init = qcom_secondary_init,
338338
.smp_boot_secondary = msm8660_boot_secondary,
@@ -342,7 +342,7 @@ static struct smp_operations smp_msm8660_ops __initdata = {
342342
};
343343
CPU_METHOD_OF_DECLARE(qcom_smp, "qcom,gcc-msm8660", &smp_msm8660_ops);
344344

345-
static struct smp_operations qcom_smp_kpssv1_ops __initdata = {
345+
static const struct smp_operations qcom_smp_kpssv1_ops __initconst = {
346346
.smp_prepare_cpus = qcom_smp_prepare_cpus,
347347
.smp_secondary_init = qcom_secondary_init,
348348
.smp_boot_secondary = kpssv1_boot_secondary,
@@ -352,7 +352,7 @@ static struct smp_operations qcom_smp_kpssv1_ops __initdata = {
352352
};
353353
CPU_METHOD_OF_DECLARE(qcom_smp_kpssv1, "qcom,kpss-acc-v1", &qcom_smp_kpssv1_ops);
354354

355-
static struct smp_operations qcom_smp_kpssv2_ops __initdata = {
355+
static const struct smp_operations qcom_smp_kpssv2_ops __initconst = {
356356
.smp_prepare_cpus = qcom_smp_prepare_cpus,
357357
.smp_secondary_init = qcom_secondary_init,
358358
.smp_boot_secondary = kpssv2_boot_secondary,

‎arch/arm/mach-realview/core.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ extern int realview_usb_register(struct resource *res);
5454
extern void realview_init_early(void);
5555
extern void realview_fixup(struct tag *tags, char **from);
5656

57-
extern struct smp_operations realview_smp_ops;
57+
extern const struct smp_operations realview_smp_ops;
5858
extern void realview_cpu_die(unsigned int cpu);
5959

6060
#endif

‎arch/arm/mach-realview/platsmp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ static void __init realview_smp_prepare_cpus(unsigned int max_cpus)
7575
__io_address(REALVIEW_SYS_FLAGSSET));
7676
}
7777

78-
struct smp_operations realview_smp_ops __initdata = {
78+
const struct smp_operations realview_smp_ops __initconst = {
7979
.smp_init_cpus = realview_smp_init_cpus,
8080
.smp_prepare_cpus = realview_smp_prepare_cpus,
8181
.smp_secondary_init = versatile_secondary_init,

‎arch/arm/mach-rockchip/platsmp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ static void rockchip_cpu_die(unsigned int cpu)
340340
}
341341
#endif
342342

343-
static struct smp_operations rockchip_smp_ops __initdata = {
343+
static const struct smp_operations rockchip_smp_ops __initconst = {
344344
.smp_prepare_cpus = rockchip_smp_prepare_cpus,
345345
.smp_boot_secondary = rockchip_boot_secondary,
346346
#ifdef CONFIG_HOTPLUG_CPU

‎arch/arm/mach-shmobile/r8a7779.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33

44
extern void r8a7779_pm_init(void);
55

6-
extern struct smp_operations r8a7779_smp_ops;
6+
extern const struct smp_operations r8a7779_smp_ops;
77

88
#endif /* __ASM_R8A7779_H__ */

‎arch/arm/mach-shmobile/r8a7790.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#ifndef __ASM_R8A7790_H__
22
#define __ASM_R8A7790_H__
33

4-
extern struct smp_operations r8a7790_smp_ops;
4+
extern const struct smp_operations r8a7790_smp_ops;
55

66
#endif /* __ASM_R8A7790_H__ */

‎arch/arm/mach-shmobile/r8a7791.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#ifndef __ASM_R8A7791_H__
22
#define __ASM_R8A7791_H__
33

4-
extern struct smp_operations r8a7791_smp_ops;
4+
extern const struct smp_operations r8a7791_smp_ops;
55

66
#endif /* __ASM_R8A7791_H__ */

‎arch/arm/mach-shmobile/setup-emev2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ static const char *const emev2_boards_compat_dt[] __initconst = {
4242
NULL,
4343
};
4444

45-
extern struct smp_operations emev2_smp_ops;
45+
extern const struct smp_operations emev2_smp_ops;
4646

4747
DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)")
4848
.smp = smp_ops(emev2_smp_ops),

‎arch/arm/mach-shmobile/sh73a0.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#ifndef __ASM_SH73A0_H__
22
#define __ASM_SH73A0_H__
33

4-
extern struct smp_operations sh73a0_smp_ops;
4+
extern const struct smp_operations sh73a0_smp_ops;
55

66
#endif /* __ASM_SH73A0_H__ */

‎arch/arm/mach-shmobile/smp-emev2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ static void __init emev2_smp_prepare_cpus(unsigned int max_cpus)
4949
shmobile_smp_scu_prepare_cpus(max_cpus);
5050
}
5151

52-
struct smp_operations emev2_smp_ops __initdata = {
52+
const struct smp_operations emev2_smp_ops __initconst = {
5353
.smp_prepare_cpus = emev2_smp_prepare_cpus,
5454
.smp_boot_secondary = emev2_boot_secondary,
5555
};

‎arch/arm/mach-shmobile/smp-r8a7779.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ static int r8a7779_cpu_kill(unsigned int cpu)
117117
}
118118
#endif /* CONFIG_HOTPLUG_CPU */
119119

120-
struct smp_operations r8a7779_smp_ops __initdata = {
120+
const struct smp_operations r8a7779_smp_ops __initconst = {
121121
.smp_prepare_cpus = r8a7779_smp_prepare_cpus,
122122
.smp_boot_secondary = r8a7779_boot_secondary,
123123
#ifdef CONFIG_HOTPLUG_CPU

‎arch/arm/mach-shmobile/smp-r8a7790.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ static void __init r8a7790_smp_prepare_cpus(unsigned int max_cpus)
6060
rcar_sysc_power_up(&r8a7790_ca7_scu);
6161
}
6262

63-
struct smp_operations r8a7790_smp_ops __initdata = {
63+
const struct smp_operations r8a7790_smp_ops __initconst = {
6464
.smp_prepare_cpus = r8a7790_smp_prepare_cpus,
6565
.smp_boot_secondary = shmobile_smp_apmu_boot_secondary,
6666
#ifdef CONFIG_HOTPLUG_CPU

‎arch/arm/mach-shmobile/smp-r8a7791.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ static int r8a7791_smp_boot_secondary(unsigned int cpu,
5454
return shmobile_smp_apmu_boot_secondary(cpu, idle);
5555
}
5656

57-
struct smp_operations r8a7791_smp_ops __initdata = {
57+
const struct smp_operations r8a7791_smp_ops __initconst = {
5858
.smp_prepare_cpus = r8a7791_smp_prepare_cpus,
5959
.smp_boot_secondary = r8a7791_smp_boot_secondary,
6060
#ifdef CONFIG_HOTPLUG_CPU

0 commit comments

Comments
 (0)