Commit 75305275 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Arnd Bergmann

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: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Acked-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: default avatarMoritz Fischer <moritz.fischer@ettus.com>
Acked-by: Stephen Boyd <sboyd@codeaurora.org> # qcom part
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Acked-by: default avatarPatrice Chotard <patrice.chotard@st.com>
Acked-by: default avatarHeiko Stuebner <heiko@sntech.de>
Acked-by: default avatarWei Xu <xuwei5@hisilicon.com>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Acked-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
Acked-by: default avatarShawn Guo <shawnguo@kernel.org>
Acked-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>
Acked-by: default avatarThierry Reding <treding@nvidia.com>
Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Acked-by: default avatarLiviu Dudau <Liviu.Dudau@arm.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 635e958d
...@@ -83,7 +83,7 @@ static void mcpm_cpu_die(unsigned int cpu) ...@@ -83,7 +83,7 @@ static void mcpm_cpu_die(unsigned int cpu)
#endif #endif
static struct smp_operations __initdata mcpm_smp_ops = { static const struct smp_operations mcpm_smp_ops __initconst = {
.smp_boot_secondary = mcpm_boot_secondary, .smp_boot_secondary = mcpm_boot_secondary,
.smp_secondary_init = mcpm_secondary_init, .smp_secondary_init = mcpm_secondary_init,
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#ifndef __ASM_ARM_PSCI_H #ifndef __ASM_ARM_PSCI_H
#define __ASM_ARM_PSCI_H #define __ASM_ARM_PSCI_H
extern struct smp_operations psci_smp_ops; extern const struct smp_operations psci_smp_ops;
#ifdef CONFIG_ARM_PSCI #ifdef CONFIG_ARM_PSCI
bool psci_smp_available(void); bool psci_smp_available(void);
......
...@@ -120,7 +120,7 @@ bool __init psci_smp_available(void) ...@@ -120,7 +120,7 @@ bool __init psci_smp_available(void)
return (psci_ops.cpu_on != NULL); return (psci_ops.cpu_on != NULL);
} }
struct smp_operations __initdata psci_smp_ops = { const struct smp_operations psci_smp_ops __initconst = {
.smp_boot_secondary = psci_boot_secondary, .smp_boot_secondary = psci_boot_secondary,
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
.cpu_disable = psci_cpu_disable, .cpu_disable = psci_cpu_disable,
......
...@@ -42,7 +42,7 @@ static void __init alpine_smp_prepare_cpus(unsigned int max_cpus) ...@@ -42,7 +42,7 @@ static void __init alpine_smp_prepare_cpus(unsigned int max_cpus)
alpine_cpu_pm_init(); alpine_cpu_pm_init();
} }
static struct smp_operations alpine_smp_ops __initdata = { static const struct smp_operations alpine_smp_ops __initconst = {
.smp_prepare_cpus = alpine_smp_prepare_cpus, .smp_prepare_cpus = alpine_smp_prepare_cpus,
.smp_boot_secondary = alpine_boot_secondary, .smp_boot_secondary = alpine_boot_secondary,
}; };
......
...@@ -82,7 +82,7 @@ static void __init axxia_smp_prepare_cpus(unsigned int max_cpus) ...@@ -82,7 +82,7 @@ static void __init axxia_smp_prepare_cpus(unsigned int max_cpus)
} }
} }
static struct smp_operations axxia_smp_ops __initdata = { static const struct smp_operations axxia_smp_ops __initconst = {
.smp_prepare_cpus = axxia_smp_prepare_cpus, .smp_prepare_cpus = axxia_smp_prepare_cpus,
.smp_boot_secondary = axxia_boot_secondary, .smp_boot_secondary = axxia_boot_secondary,
}; };
......
...@@ -161,7 +161,7 @@ static void __init bcm63138_smp_prepare_cpus(unsigned int max_cpus) ...@@ -161,7 +161,7 @@ static void __init bcm63138_smp_prepare_cpus(unsigned int max_cpus)
} }
} }
struct smp_operations bcm63138_smp_ops __initdata = { static const struct smp_operations bcm63138_smp_ops __initconst = {
.smp_prepare_cpus = bcm63138_smp_prepare_cpus, .smp_prepare_cpus = bcm63138_smp_prepare_cpus,
.smp_boot_secondary = bcm63138_smp_boot_secondary, .smp_boot_secondary = bcm63138_smp_boot_secondary,
}; };
......
...@@ -194,7 +194,7 @@ static int bcm_boot_secondary(unsigned int cpu, struct task_struct *idle) ...@@ -194,7 +194,7 @@ static int bcm_boot_secondary(unsigned int cpu, struct task_struct *idle)
return -ENOSYS; return -ENOSYS;
} }
static struct smp_operations bcm_smp_ops __initdata = { static const struct smp_operations bcm_smp_ops __initconst = {
.smp_prepare_cpus = bcm_smp_prepare_cpus, .smp_prepare_cpus = bcm_smp_prepare_cpus,
.smp_boot_secondary = bcm_boot_secondary, .smp_boot_secondary = bcm_boot_secondary,
}; };
......
...@@ -356,7 +356,7 @@ static int brcmstb_boot_secondary(unsigned int cpu, struct task_struct *idle) ...@@ -356,7 +356,7 @@ static int brcmstb_boot_secondary(unsigned int cpu, struct task_struct *idle)
return 0; return 0;
} }
static struct smp_operations brcmstb_smp_ops __initdata = { static const struct smp_operations brcmstb_smp_ops __initconst = {
.smp_prepare_cpus = brcmstb_cpu_ctrl_setup, .smp_prepare_cpus = brcmstb_cpu_ctrl_setup,
.smp_boot_secondary = brcmstb_boot_secondary, .smp_boot_secondary = brcmstb_boot_secondary,
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
......
...@@ -119,7 +119,7 @@ static int berlin_cpu_kill(unsigned int cpu) ...@@ -119,7 +119,7 @@ static int berlin_cpu_kill(unsigned int cpu)
} }
#endif #endif
static struct smp_operations berlin_smp_ops __initdata = { static const struct smp_operations berlin_smp_ops __initconst = {
.smp_prepare_cpus = berlin_smp_prepare_cpus, .smp_prepare_cpus = berlin_smp_prepare_cpus,
.smp_boot_secondary = berlin_boot_secondary, .smp_boot_secondary = berlin_boot_secondary,
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
......
...@@ -149,7 +149,7 @@ static inline void exynos_pm_init(void) {} ...@@ -149,7 +149,7 @@ static inline void exynos_pm_init(void) {}
extern void exynos_cpu_resume(void); extern void exynos_cpu_resume(void);
extern void exynos_cpu_resume_ns(void); extern void exynos_cpu_resume_ns(void);
extern struct smp_operations exynos_smp_ops; extern const struct smp_operations exynos_smp_ops;
extern void exynos_cpu_power_down(int cpu); extern void exynos_cpu_power_down(int cpu);
extern void exynos_cpu_power_up(int cpu); extern void exynos_cpu_power_up(int cpu);
......
...@@ -479,7 +479,7 @@ static void exynos_cpu_die(unsigned int cpu) ...@@ -479,7 +479,7 @@ static void exynos_cpu_die(unsigned int cpu)
} }
#endif /* CONFIG_HOTPLUG_CPU */ #endif /* CONFIG_HOTPLUG_CPU */
struct smp_operations exynos_smp_ops __initdata = { const struct smp_operations exynos_smp_ops __initconst = {
.smp_init_cpus = exynos_smp_init_cpus, .smp_init_cpus = exynos_smp_init_cpus,
.smp_prepare_cpus = exynos_smp_prepare_cpus, .smp_prepare_cpus = exynos_smp_prepare_cpus,
.smp_secondary_init = exynos_secondary_init, .smp_secondary_init = exynos_secondary_init,
......
...@@ -239,7 +239,7 @@ static int hip04_cpu_kill(unsigned int l_cpu) ...@@ -239,7 +239,7 @@ static int hip04_cpu_kill(unsigned int l_cpu)
} }
#endif #endif
static struct smp_operations __initdata hip04_smp_ops = { static const struct smp_operations hip04_smp_ops __initconst = {
.smp_boot_secondary = hip04_boot_secondary, .smp_boot_secondary = hip04_boot_secondary,
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
.cpu_die = hip04_cpu_die, .cpu_die = hip04_cpu_die,
......
...@@ -89,7 +89,7 @@ static int hi3xxx_boot_secondary(unsigned int cpu, struct task_struct *idle) ...@@ -89,7 +89,7 @@ static int hi3xxx_boot_secondary(unsigned int cpu, struct task_struct *idle)
return 0; return 0;
} }
static struct smp_operations hi3xxx_smp_ops __initdata = { static const struct smp_operations hi3xxx_smp_ops __initconst = {
.smp_prepare_cpus = hi3xxx_smp_prepare_cpus, .smp_prepare_cpus = hi3xxx_smp_prepare_cpus,
.smp_boot_secondary = hi3xxx_boot_secondary, .smp_boot_secondary = hi3xxx_boot_secondary,
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
...@@ -126,7 +126,7 @@ static int hix5hd2_boot_secondary(unsigned int cpu, struct task_struct *idle) ...@@ -126,7 +126,7 @@ static int hix5hd2_boot_secondary(unsigned int cpu, struct task_struct *idle)
} }
static struct smp_operations hix5hd2_smp_ops __initdata = { static const struct smp_operations hix5hd2_smp_ops __initconst = {
.smp_prepare_cpus = hisi_common_smp_prepare_cpus, .smp_prepare_cpus = hisi_common_smp_prepare_cpus,
.smp_boot_secondary = hix5hd2_boot_secondary, .smp_boot_secondary = hix5hd2_boot_secondary,
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
...@@ -176,7 +176,7 @@ static int hip01_boot_secondary(unsigned int cpu, struct task_struct *idle) ...@@ -176,7 +176,7 @@ static int hip01_boot_secondary(unsigned int cpu, struct task_struct *idle)
return 0; return 0;
} }
static struct smp_operations hip01_smp_ops __initdata = { static const struct smp_operations hip01_smp_ops __initconst = {
.smp_prepare_cpus = hisi_common_smp_prepare_cpus, .smp_prepare_cpus = hisi_common_smp_prepare_cpus,
.smp_boot_secondary = hip01_boot_secondary, .smp_boot_secondary = hip01_boot_secondary,
}; };
......
...@@ -153,7 +153,7 @@ void imx_init_l2cache(void); ...@@ -153,7 +153,7 @@ void imx_init_l2cache(void);
static inline void imx_init_l2cache(void) {} static inline void imx_init_l2cache(void) {}
#endif #endif
extern struct smp_operations imx_smp_ops; extern const struct smp_operations imx_smp_ops;
extern struct smp_operations ls1021a_smp_ops; extern const struct smp_operations ls1021a_smp_ops;
#endif #endif
...@@ -88,7 +88,7 @@ static void __init imx_smp_prepare_cpus(unsigned int max_cpus) ...@@ -88,7 +88,7 @@ static void __init imx_smp_prepare_cpus(unsigned int max_cpus)
sync_cache_w(&g_diag_reg); sync_cache_w(&g_diag_reg);
} }
struct smp_operations imx_smp_ops __initdata = { const struct smp_operations imx_smp_ops __initconst = {
.smp_init_cpus = imx_smp_init_cpus, .smp_init_cpus = imx_smp_init_cpus,
.smp_prepare_cpus = imx_smp_prepare_cpus, .smp_prepare_cpus = imx_smp_prepare_cpus,
.smp_boot_secondary = imx_boot_secondary, .smp_boot_secondary = imx_boot_secondary,
...@@ -123,7 +123,7 @@ static void __init ls1021a_smp_prepare_cpus(unsigned int max_cpus) ...@@ -123,7 +123,7 @@ static void __init ls1021a_smp_prepare_cpus(unsigned int max_cpus)
iounmap(dcfg_base); iounmap(dcfg_base);
} }
struct smp_operations ls1021a_smp_ops __initdata = { const struct smp_operations ls1021a_smp_ops __initconst = {
.smp_prepare_cpus = ls1021a_smp_prepare_cpus, .smp_prepare_cpus = ls1021a_smp_prepare_cpus,
.smp_boot_secondary = ls1021a_boot_secondary, .smp_boot_secondary = ls1021a_boot_secondary,
}; };
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#ifndef __ASSEMBLER__ #ifndef __ASSEMBLER__
extern struct smp_operations keystone_smp_ops; extern const struct smp_operations keystone_smp_ops;
extern void secondary_startup(void); extern void secondary_startup(void);
extern u32 keystone_cpu_smc(u32 command, u32 cpu, u32 addr); extern u32 keystone_cpu_smc(u32 command, u32 cpu, u32 addr);
extern int keystone_pm_runtime_init(void); extern int keystone_pm_runtime_init(void);
......
...@@ -39,6 +39,6 @@ static int keystone_smp_boot_secondary(unsigned int cpu, ...@@ -39,6 +39,6 @@ static int keystone_smp_boot_secondary(unsigned int cpu,
return error; return error;
} }
struct smp_operations keystone_smp_ops __initdata = { const struct smp_operations keystone_smp_ops __initconst = {
.smp_boot_secondary = keystone_smp_boot_secondary, .smp_boot_secondary = keystone_smp_boot_secondary,
}; };
...@@ -128,13 +128,13 @@ static void __init mtk_smp_prepare_cpus(unsigned int max_cpus) ...@@ -128,13 +128,13 @@ static void __init mtk_smp_prepare_cpus(unsigned int max_cpus)
__mtk_smp_prepare_cpus(max_cpus, 0); __mtk_smp_prepare_cpus(max_cpus, 0);
} }
static struct smp_operations mt81xx_tz_smp_ops __initdata = { static const struct smp_operations mt81xx_tz_smp_ops __initconst = {
.smp_prepare_cpus = mtk_tz_smp_prepare_cpus, .smp_prepare_cpus = mtk_tz_smp_prepare_cpus,
.smp_boot_secondary = mtk_boot_secondary, .smp_boot_secondary = mtk_boot_secondary,
}; };
CPU_METHOD_OF_DECLARE(mt81xx_tz_smp, "mediatek,mt81xx-tz-smp", &mt81xx_tz_smp_ops); CPU_METHOD_OF_DECLARE(mt81xx_tz_smp, "mediatek,mt81xx-tz-smp", &mt81xx_tz_smp_ops);
static struct smp_operations mt6589_smp_ops __initdata = { static const struct smp_operations mt6589_smp_ops __initconst = {
.smp_prepare_cpus = mtk_smp_prepare_cpus, .smp_prepare_cpus = mtk_smp_prepare_cpus,
.smp_boot_secondary = mtk_boot_secondary, .smp_boot_secondary = mtk_boot_secondary,
}; };
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
void armada_xp_secondary_startup(void); void armada_xp_secondary_startup(void);
extern struct smp_operations armada_xp_smp_ops; extern const struct smp_operations armada_xp_smp_ops;
#endif #endif
#endif /* __MACH_ARMADA_370_XP_H */ #endif /* __MACH_ARMADA_370_XP_H */
...@@ -93,11 +93,11 @@ static int armada_38x_cpu_kill(unsigned int cpu) ...@@ -93,11 +93,11 @@ static int armada_38x_cpu_kill(unsigned int cpu)
} }
#endif #endif
static struct smp_operations mvebu_cortex_a9_smp_ops __initdata = { static const struct smp_operations mvebu_cortex_a9_smp_ops __initconst = {
.smp_boot_secondary = mvebu_cortex_a9_boot_secondary, .smp_boot_secondary = mvebu_cortex_a9_boot_secondary,
}; };
static struct smp_operations armada_38x_smp_ops __initdata = { static const struct smp_operations armada_38x_smp_ops __initconst = {
.smp_boot_secondary = mvebu_cortex_a9_boot_secondary, .smp_boot_secondary = mvebu_cortex_a9_boot_secondary,
.smp_secondary_init = armada_38x_secondary_init, .smp_secondary_init = armada_38x_secondary_init,
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
......
...@@ -170,7 +170,7 @@ static int armada_xp_cpu_kill(unsigned int cpu) ...@@ -170,7 +170,7 @@ static int armada_xp_cpu_kill(unsigned int cpu)
} }
#endif #endif
struct smp_operations armada_xp_smp_ops __initdata = { const struct smp_operations armada_xp_smp_ops __initconst = {
.smp_init_cpus = armada_xp_smp_init_cpus, .smp_init_cpus = armada_xp_smp_init_cpus,
.smp_prepare_cpus = armada_xp_smp_prepare_cpus, .smp_prepare_cpus = armada_xp_smp_prepare_cpus,
.smp_boot_secondary = armada_xp_boot_secondary, .smp_boot_secondary = armada_xp_boot_secondary,
......
...@@ -270,7 +270,7 @@ extern u32 omap_read_auxcoreboot0(void); ...@@ -270,7 +270,7 @@ extern u32 omap_read_auxcoreboot0(void);
extern void omap4_cpu_die(unsigned int cpu); extern void omap4_cpu_die(unsigned int cpu);
extern struct smp_operations omap4_smp_ops; extern const struct smp_operations omap4_smp_ops;
extern void omap5_secondary_startup(void); extern void omap5_secondary_startup(void);
extern void omap5_secondary_hyp_startup(void); extern void omap5_secondary_hyp_startup(void);
......
...@@ -241,7 +241,7 @@ static void __init omap4_smp_prepare_cpus(unsigned int max_cpus) ...@@ -241,7 +241,7 @@ static void __init omap4_smp_prepare_cpus(unsigned int max_cpus)
} }
struct smp_operations omap4_smp_ops __initdata = { const struct smp_operations omap4_smp_ops __initconst = {
.smp_init_cpus = omap4_smp_init_cpus, .smp_init_cpus = omap4_smp_init_cpus,
.smp_prepare_cpus = omap4_smp_prepare_cpus, .smp_prepare_cpus = omap4_smp_prepare_cpus,
.smp_secondary_init = omap4_secondary_init, .smp_secondary_init = omap4_secondary_init,
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <asm/exception.h> #include <asm/exception.h>
extern struct smp_operations sirfsoc_smp_ops; extern const struct smp_operations sirfsoc_smp_ops;
extern void sirfsoc_secondary_startup(void); extern void sirfsoc_secondary_startup(void);
extern void sirfsoc_cpu_die(unsigned int cpu); extern void sirfsoc_cpu_die(unsigned int cpu);
......
...@@ -112,7 +112,7 @@ static int sirfsoc_boot_secondary(unsigned int cpu, struct task_struct *idle) ...@@ -112,7 +112,7 @@ static int sirfsoc_boot_secondary(unsigned int cpu, struct task_struct *idle)
return pen_release != -1 ? -ENOSYS : 0; return pen_release != -1 ? -ENOSYS : 0;
} }
struct smp_operations sirfsoc_smp_ops __initdata = { const struct smp_operations sirfsoc_smp_ops __initconst = {
.smp_secondary_init = sirfsoc_secondary_init, .smp_secondary_init = sirfsoc_secondary_init,
.smp_boot_secondary = sirfsoc_boot_secondary, .smp_boot_secondary = sirfsoc_boot_secondary,
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
......
...@@ -332,7 +332,7 @@ static void __init qcom_smp_prepare_cpus(unsigned int max_cpus) ...@@ -332,7 +332,7 @@ static void __init qcom_smp_prepare_cpus(unsigned int max_cpus)
} }
} }
static struct smp_operations smp_msm8660_ops __initdata = { static const struct smp_operations smp_msm8660_ops __initconst = {
.smp_prepare_cpus = qcom_smp_prepare_cpus, .smp_prepare_cpus = qcom_smp_prepare_cpus,
.smp_secondary_init = qcom_secondary_init, .smp_secondary_init = qcom_secondary_init,
.smp_boot_secondary = msm8660_boot_secondary, .smp_boot_secondary = msm8660_boot_secondary,
...@@ -342,7 +342,7 @@ static struct smp_operations smp_msm8660_ops __initdata = { ...@@ -342,7 +342,7 @@ static struct smp_operations smp_msm8660_ops __initdata = {
}; };
CPU_METHOD_OF_DECLARE(qcom_smp, "qcom,gcc-msm8660", &smp_msm8660_ops); CPU_METHOD_OF_DECLARE(qcom_smp, "qcom,gcc-msm8660", &smp_msm8660_ops);
static struct smp_operations qcom_smp_kpssv1_ops __initdata = { static const struct smp_operations qcom_smp_kpssv1_ops __initconst = {
.smp_prepare_cpus = qcom_smp_prepare_cpus, .smp_prepare_cpus = qcom_smp_prepare_cpus,
.smp_secondary_init = qcom_secondary_init, .smp_secondary_init = qcom_secondary_init,
.smp_boot_secondary = kpssv1_boot_secondary, .smp_boot_secondary = kpssv1_boot_secondary,
...@@ -352,7 +352,7 @@ static struct smp_operations qcom_smp_kpssv1_ops __initdata = { ...@@ -352,7 +352,7 @@ static struct smp_operations qcom_smp_kpssv1_ops __initdata = {
}; };
CPU_METHOD_OF_DECLARE(qcom_smp_kpssv1, "qcom,kpss-acc-v1", &qcom_smp_kpssv1_ops); CPU_METHOD_OF_DECLARE(qcom_smp_kpssv1, "qcom,kpss-acc-v1", &qcom_smp_kpssv1_ops);
static struct smp_operations qcom_smp_kpssv2_ops __initdata = { static const struct smp_operations qcom_smp_kpssv2_ops __initconst = {
.smp_prepare_cpus = qcom_smp_prepare_cpus, .smp_prepare_cpus = qcom_smp_prepare_cpus,
.smp_secondary_init = qcom_secondary_init, .smp_secondary_init = qcom_secondary_init,
.smp_boot_secondary = kpssv2_boot_secondary, .smp_boot_secondary = kpssv2_boot_secondary,
......
...@@ -54,7 +54,7 @@ extern int realview_usb_register(struct resource *res); ...@@ -54,7 +54,7 @@ extern int realview_usb_register(struct resource *res);
extern void realview_init_early(void); extern void realview_init_early(void);
extern void realview_fixup(struct tag *tags, char **from); extern void realview_fixup(struct tag *tags, char **from);
extern struct smp_operations realview_smp_ops; extern const struct smp_operations realview_smp_ops;
extern void realview_cpu_die(unsigned int cpu); extern void realview_cpu_die(unsigned int cpu);
#endif #endif
...@@ -75,7 +75,7 @@ static void __init realview_smp_prepare_cpus(unsigned int max_cpus) ...@@ -75,7 +75,7 @@ static void __init realview_smp_prepare_cpus(unsigned int max_cpus)
__io_address(REALVIEW_SYS_FLAGSSET)); __io_address(REALVIEW_SYS_FLAGSSET));
} }
struct smp_operations realview_smp_ops __initdata = { const struct smp_operations realview_smp_ops __initconst = {
.smp_init_cpus = realview_smp_init_cpus, .smp_init_cpus = realview_smp_init_cpus,
.smp_prepare_cpus = realview_smp_prepare_cpus, .smp_prepare_cpus = realview_smp_prepare_cpus,
.smp_secondary_init = versatile_secondary_init, .smp_secondary_init = versatile_secondary_init,
......
...@@ -340,7 +340,7 @@ static void rockchip_cpu_die(unsigned int cpu) ...@@ -340,7 +340,7 @@ static void rockchip_cpu_die(unsigned int cpu)
} }
#endif #endif
static struct smp_operations rockchip_smp_ops __initdata = { static const struct smp_operations rockchip_smp_ops __initconst = {
.smp_prepare_cpus = rockchip_smp_prepare_cpus, .smp_prepare_cpus = rockchip_smp_prepare_cpus,
.smp_boot_secondary = rockchip_boot_secondary, .smp_boot_secondary = rockchip_boot_secondary,
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
......
...@@ -3,6 +3,6 @@ ...@@ -3,6 +3,6 @@
extern void r8a7779_pm_init(void); extern void r8a7779_pm_init(void);
extern struct smp_operations r8a7779_smp_ops; extern const struct smp_operations r8a7779_smp_ops;
#endif /* __ASM_R8A7779_H__ */ #endif /* __ASM_R8A7779_H__ */
#ifndef __ASM_R8A7790_H__ #ifndef __ASM_R8A7790_H__
#define __ASM_R8A7790_H__ #define __ASM_R8A7790_H__
extern struct smp_operations r8a7790_smp_ops; extern const struct smp_operations r8a7790_smp_ops;
#endif /* __ASM_R8A7790_H__ */ #endif /* __ASM_R8A7790_H__ */
#ifndef __ASM_R8A7791_H__ #ifndef __ASM_R8A7791_H__
#define __ASM_R8A7791_H__ #define __ASM_R8A7791_H__
extern struct smp_operations r8a7791_smp_ops; extern const struct smp_operations r8a7791_smp_ops;
#endif /* __ASM_R8A7791_H__ */ #endif /* __ASM_R8A7791_H__ */
...@@ -42,7 +42,7 @@ static const char *const emev2_boards_compat_dt[] __initconst = { ...@@ -42,7 +42,7 @@ static const char *const emev2_boards_compat_dt[] __initconst = {
NULL, NULL,
}; };
extern struct smp_operations emev2_smp_ops; extern const struct smp_operations emev2_smp_ops;
DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)") DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)")
.smp = smp_ops(emev2_smp_ops), .smp = smp_ops(emev2_smp_ops),
......
#ifndef __ASM_SH73A0_H__ #ifndef __ASM_SH73A0_H__
#define __ASM_SH73A0_H__ #define __ASM_SH73A0_H__
extern struct smp_operations sh73a0_smp_ops; extern const struct smp_operations sh73a0_smp_ops;
#endif /* __ASM_SH73A0_H__ */ #endif /* __ASM_SH73A0_H__ */
...@@ -49,7 +49,7 @@ static void __init emev2_smp_prepare_cpus(unsigned int max_cpus) ...@@ -49,7 +49,7 @@ static void __init emev2_smp_prepare_cpus(unsigned int max_cpus)
shmobile_smp_scu_prepare_cpus(max_cpus); shmobile_smp_scu_prepare_cpus(max_cpus);
} }
struct smp_operations emev2_smp_ops __initdata = { const struct smp_operations emev2_smp_ops __initconst = {
.smp_prepare_cpus = emev2_smp_prepare_cpus, .smp_prepare_cpus = emev2_smp_prepare_cpus,
.smp_boot_secondary = emev2_boot_secondary, .smp_boot_secondary = emev2_boot_secondary,
}; };
...@@ -117,7 +117,7 @@ static int r8a7779_cpu_kill(unsigned int cpu) ...@@ -117,7 +117,7 @@ static int r8a7779_cpu_kill(unsigned int cpu)
} }
#endif /* CONFIG_HOTPLUG_CPU */ #endif /* CONFIG_HOTPLUG_CPU */
struct smp_operations r8a7779_smp_ops __initdata = { const struct smp_operations r8a7779_smp_ops __initconst = {
.smp_prepare_cpus = r8a7779_smp_prepare_cpus, .smp_prepare_cpus = r8a7779_smp_prepare_cpus,
.smp_boot_secondary = r8a7779_boot_secondary, .smp_boot_secondary = r8a7779_boot_secondary,
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
......
...@@ -60,7 +60,7 @@ static void __init r8a7790_smp_prepare_cpus(unsigned int max_cpus) ...@@ -60,7 +60,7 @@ static void __init r8a7790_smp_prepare_cpus(unsigned int max_cpus)
rcar_sysc_power_up(&r8a7790_ca7_scu); rcar_sysc_power_up(&r8a7790_ca7_scu);
} }
struct smp_operations r8a7790_smp_ops __initdata = { const struct smp_operations r8a7790_smp_ops __initconst = {
.smp_prepare_cpus = r8a7790_smp_prepare_cpus, .smp_prepare_cpus = r8a7790_smp_prepare_cpus,
.smp_boot_secondary = shmobile_smp_apmu_boot_secondary, .smp_boot_secondary = shmobile_smp_apmu_boot_secondary,
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
......
...@@ -54,7 +54,7 @@ static int r8a7791_smp_boot_secondary(unsigned int cpu, ...@@ -54,7 +54,7 @@ static int r8a7791_smp_boot_secondary(unsigned int cpu,
return shmobile_smp_apmu_boot_secondary(cpu, idle); return shmobile_smp_apmu_boot_secondary(cpu, idle);
} }
struct smp_operations r8a7791_smp_ops __initdata = { const struct smp_operations r8a7791_smp_ops __initconst = {
.smp_prepare_cpus = r8a7791_smp_prepare_cpus, .smp_prepare_cpus = r8a7791_smp_prepare_cpus,
.smp_boot_secondary = r8a7791_smp_boot_secondary, .smp_boot_secondary = r8a7791_smp_boot_secondary,
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
......
...@@ -56,7 +56,7 @@ static void __init sh73a0_smp_prepare_cpus(unsigned int max_cpus) ...@@ -56,7 +56,7 @@ static void __init sh73a0_smp_prepare_cpus(unsigned int max_cpus)
shmobile_smp_scu_prepare_cpus(max_cpus); shmobile_smp_scu_prepare_cpus(max_cpus);
} }
struct smp_operations sh73a0_smp_ops __initdata = { const struct smp_operations sh73a0_smp_ops __initconst = {
.smp_prepare_cpus = sh73a0_smp_prepare_cpus, .smp_prepare_cpus = sh73a0_smp_prepare_cpus,
.smp_boot_secondary = sh73a0_boot_secondary, .smp_boot_secondary = sh73a0_boot_secondary,
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
......
...@@ -117,7 +117,7 @@ static int socfpga_cpu_kill(unsigned int cpu) ...@@ -117,7 +117,7 @@ static int socfpga_cpu_kill(unsigned int cpu)
return 1; return 1;
} }
static struct smp_operations socfpga_smp_ops __initdata = { static const struct smp_operations socfpga_smp_ops __initconst = {
.smp_prepare_cpus = socfpga_smp_prepare_cpus, .smp_prepare_cpus = socfpga_smp_prepare_cpus,
.smp_boot_secondary = socfpga_boot_secondary, .smp_boot_secondary = socfpga_boot_secondary,
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
...@@ -126,7 +126,7 @@ static struct smp_operations socfpga_smp_ops __initdata = { ...@@ -126,7 +126,7 @@ static struct smp_operations socfpga_smp_ops __initdata = {
#endif #endif
}; };
static struct smp_operations socfpga_a10_smp_ops __initdata = { static const struct smp_operations socfpga_a10_smp_ops __initconst = {
.smp_prepare_cpus = socfpga_smp_prepare_cpus, .smp_prepare_cpus = socfpga_smp_prepare_cpus,
.smp_boot_secondary = socfpga_a10_boot_secondary, .smp_boot_secondary = socfpga_a10_boot_secondary,
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
......
...@@ -39,7 +39,7 @@ void spear_restart(enum reboot_mode, const char *); ...@@ -39,7 +39,7 @@ void spear_restart(enum reboot_mode, const char *);
void spear13xx_secondary_startup(void); void spear13xx_secondary_startup(void);
void spear13xx_cpu_die(unsigned int cpu); void spear13xx_cpu_die(unsigned int cpu);
extern struct smp_operations spear13xx_smp_ops; extern const struct smp_operations spear13xx_smp_ops;
#ifdef CONFIG_MACH_SPEAR1310 #ifdef CONFIG_MACH_SPEAR1310
void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base); void __init spear1310_clk_init(void __iomem *misc_base, void __iomem *ras_base);
......
...@@ -120,7 +120,7 @@ static void __init spear13xx_smp_prepare_cpus(unsigned int max_cpus) ...@@ -120,7 +120,7 @@ static void __init spear13xx_smp_prepare_cpus(unsigned int max_cpus)
__raw_writel(virt_to_phys(spear13xx_secondary_startup), SYS_LOCATION); __raw_writel(virt_to_phys(spear13xx_secondary_startup), SYS_LOCATION);
} }
struct smp_operations spear13xx_smp_ops __initdata = { const struct smp_operations spear13xx_smp_ops __initconst = {
.smp_init_cpus = spear13xx_smp_init_cpus, .smp_init_cpus = spear13xx_smp_init_cpus,
.smp_prepare_cpus = spear13xx_smp_prepare_cpus, .smp_prepare_cpus = spear13xx_smp_prepare_cpus,
.smp_secondary_init = spear13xx_secondary_init, .smp_secondary_init = spear13xx_secondary_init,
......
...@@ -156,7 +156,7 @@ static void __init sti_smp_prepare_cpus(unsigned int max_cpus) ...@@ -156,7 +156,7 @@ static void __init sti_smp_prepare_cpus(unsigned int max_cpus)
} }
} }
struct smp_operations __initdata sti_smp_ops = { const struct smp_operations sti_smp_ops __initconst = {
.smp_prepare_cpus = sti_smp_prepare_cpus, .smp_prepare_cpus = sti_smp_prepare_cpus,
.smp_secondary_init = sti_secondary_init, .smp_secondary_init = sti_secondary_init,
.smp_boot_secondary = sti_boot_secondary, .smp_boot_secondary = sti_boot_secondary,
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#ifndef __MACH_STI_SMP_H #ifndef __MACH_STI_SMP_H
#define __MACH_STI_SMP_H #define __MACH_STI_SMP_H
extern struct smp_operations sti_smp_ops; extern const struct smp_operations sti_smp_ops;
void sti_secondary_startup(void); void sti_secondary_startup(void);
......
...@@ -116,7 +116,7 @@ static int sun6i_smp_boot_secondary(unsigned int cpu, ...@@ -116,7 +116,7 @@ static int sun6i_smp_boot_secondary(unsigned int cpu,
return 0; return 0;
} }
static struct smp_operations sun6i_smp_ops __initdata = { static const struct smp_operations sun6i_smp_ops __initconst = {
.smp_prepare_cpus = sun6i_smp_prepare_cpus, .smp_prepare_cpus = sun6i_smp_prepare_cpus,
.smp_boot_secondary = sun6i_smp_boot_secondary, .smp_boot_secondary = sun6i_smp_boot_secondary,
}; };
...@@ -185,7 +185,7 @@ static int sun8i_smp_boot_secondary(unsigned int cpu, ...@@ -185,7 +185,7 @@ static int sun8i_smp_boot_secondary(unsigned int cpu,
return 0; return 0;
} }
struct smp_operations sun8i_smp_ops __initdata = { static const struct smp_operations sun8i_smp_ops __initconst = {
.smp_prepare_cpus = sun8i_smp_prepare_cpus, .smp_prepare_cpus = sun8i_smp_prepare_cpus,
.smp_boot_secondary = sun8i_smp_boot_secondary, .smp_boot_secondary = sun8i_smp_boot_secondary,
}; };
......
extern struct smp_operations tegra_smp_ops; extern const struct smp_operations tegra_smp_ops;
extern int tegra_cpu_kill(unsigned int cpu); extern int tegra_cpu_kill(unsigned int cpu);
extern void tegra_cpu_die(unsigned int cpu); extern void tegra_cpu_die(unsigned int cpu);
...@@ -192,7 +192,7 @@ static void __init tegra_smp_prepare_cpus(unsigned int max_cpus) ...@@ -192,7 +192,7 @@ static void __init tegra_smp_prepare_cpus(unsigned int max_cpus)
scu_enable(IO_ADDRESS(scu_a9_get_base())); scu_enable(IO_ADDRESS(scu_a9_get_base()));
} }
struct smp_operations tegra_smp_ops __initdata = { const struct smp_operations tegra_smp_ops __initconst = {
.smp_prepare_cpus = tegra_smp_prepare_cpus, .smp_prepare_cpus = tegra_smp_prepare_cpus,
.smp_secondary_init = tegra_secondary_init, .smp_secondary_init = tegra_secondary_init,
.smp_boot_secondary = tegra_boot_secondary, .smp_boot_secondary = tegra_boot_secondary,
......
...@@ -201,7 +201,7 @@ static int __init uniphier_smp_boot_secondary(unsigned int cpu, ...@@ -201,7 +201,7 @@ static int __init uniphier_smp_boot_secondary(unsigned int cpu,
return 0; return 0;
} }
static struct smp_operations uniphier_smp_ops __initdata = { static const struct smp_operations uniphier_smp_ops __initconst = {
.smp_prepare_cpus = uniphier_smp_prepare_cpus, .smp_prepare_cpus = uniphier_smp_prepare_cpus,
.smp_boot_secondary = uniphier_smp_boot_secondary, .smp_boot_secondary = uniphier_smp_boot_secondary,
}; };
......
...@@ -98,7 +98,7 @@ static int ux500_boot_secondary(unsigned int cpu, struct task_struct *idle) ...@@ -98,7 +98,7 @@ static int ux500_boot_secondary(unsigned int cpu, struct task_struct *idle)
return 0; return 0;
} }
struct smp_operations ux500_smp_ops __initdata = { static const struct smp_operations ux500_smp_ops __initconst = {
.smp_prepare_cpus = ux500_smp_prepare_cpus, .smp_prepare_cpus = ux500_smp_prepare_cpus,
.smp_boot_secondary = ux500_boot_secondary, .smp_boot_secondary = ux500_boot_secondary,
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
......
bool vexpress_smp_init_ops(void); bool vexpress_smp_init_ops(void);
extern struct smp_operations vexpress_smp_dt_ops; extern const struct smp_operations vexpress_smp_dt_ops;
extern void vexpress_cpu_die(unsigned int cpu); extern void vexpress_cpu_die(unsigned int cpu);
...@@ -64,7 +64,7 @@ static void __init vexpress_smp_dt_prepare_cpus(unsigned int max_cpus) ...@@ -64,7 +64,7 @@ static void __init vexpress_smp_dt_prepare_cpus(unsigned int max_cpus)
vexpress_flags_set(virt_to_phys(versatile_secondary_startup)); vexpress_flags_set(virt_to_phys(versatile_secondary_startup));
} }
struct smp_operations __initdata vexpress_smp_dt_ops = { const struct smp_operations vexpress_smp_dt_ops __initconst = {
.smp_prepare_cpus = vexpress_smp_dt_prepare_cpus, .smp_prepare_cpus = vexpress_smp_dt_prepare_cpus,
.smp_secondary_init = versatile_secondary_init, .smp_secondary_init = versatile_secondary_init,
.smp_boot_secondary = versatile_boot_secondary, .smp_boot_secondary = versatile_boot_secondary,
......
...@@ -176,7 +176,7 @@ static void zx_secondary_init(unsigned int cpu) ...@@ -176,7 +176,7 @@ static void zx_secondary_init(unsigned int cpu)
scu_power_mode(scu_base, SCU_PM_NORMAL); scu_power_mode(scu_base, SCU_PM_NORMAL);
} }
struct smp_operations zx_smp_ops __initdata = { static const struct smp_operations zx_smp_ops __initconst = {
.smp_prepare_cpus = zx_smp_prepare_cpus, .smp_prepare_cpus = zx_smp_prepare_cpus,
.smp_secondary_init = zx_secondary_init, .smp_secondary_init = zx_secondary_init,
.smp_boot_secondary = zx_boot_secondary, .smp_boot_secondary = zx_boot_secondary,
......
...@@ -30,7 +30,7 @@ extern char zynq_secondary_trampoline; ...@@ -30,7 +30,7 @@ extern char zynq_secondary_trampoline;
extern char zynq_secondary_trampoline_jump; extern char zynq_secondary_trampoline_jump;
extern char zynq_secondary_trampoline_end; extern char zynq_secondary_trampoline_end;
extern int zynq_cpun_start(u32 address, int cpu); extern int zynq_cpun_start(u32 address, int cpu);
extern struct smp_operations zynq_smp_ops __initdata; extern const struct smp_operations zynq_smp_ops;
#endif #endif
extern void __iomem *zynq_scu_base; extern void __iomem *zynq_scu_base;
......
...@@ -157,7 +157,7 @@ static void zynq_cpu_die(unsigned int cpu) ...@@ -157,7 +157,7 @@ static void zynq_cpu_die(unsigned int cpu)
} }
#endif #endif
struct smp_operations zynq_smp_ops __initdata = { const struct smp_operations zynq_smp_ops __initconst = {
.smp_init_cpus = zynq_smp_init_cpus, .smp_init_cpus = zynq_smp_init_cpus,
.smp_prepare_cpus = zynq_smp_prepare_cpus, .smp_prepare_cpus = zynq_smp_prepare_cpus,
.smp_boot_secondary = zynq_boot_secondary, .smp_boot_secondary = zynq_boot_secondary,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment