From 635e958dad5639102fcf8acf2d8feb6a80c6e689 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Sun, 15 Nov 2015 10:39:52 +0900 Subject: [PATCH] ARM: hisi: do not export smp_operations structures These three structures are only defined and referenced in mach-hisi/platsmp.c. Drop the declarations from the header and add static qualifier to the definitions. Signed-off-by: Masahiro Yamada Signed-off-by: Arnd Bergmann Acked-by: Wei Xu --- arch/arm/mach-hisi/core.h | 3 --- arch/arm/mach-hisi/platsmp.c | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-hisi/core.h b/arch/arm/mach-hisi/core.h index c7648ef1825c..e883583a23f1 100644 --- a/arch/arm/mach-hisi/core.h +++ b/arch/arm/mach-hisi/core.h @@ -6,17 +6,14 @@ extern void hi3xxx_set_cpu_jump(int cpu, void *jump_addr); extern int hi3xxx_get_cpu_jump(int cpu); extern void secondary_startup(void); -extern struct smp_operations hi3xxx_smp_ops; extern void hi3xxx_cpu_die(unsigned int cpu); extern int hi3xxx_cpu_kill(unsigned int cpu); extern void hi3xxx_set_cpu(int cpu, bool enable); -extern struct smp_operations hix5hd2_smp_ops; extern void hix5hd2_set_cpu(int cpu, bool enable); extern void hix5hd2_cpu_die(unsigned int cpu); -extern struct smp_operations hip01_smp_ops; extern void hip01_set_cpu(int cpu, bool enable); extern void hip01_cpu_die(unsigned int cpu); #endif diff --git a/arch/arm/mach-hisi/platsmp.c b/arch/arm/mach-hisi/platsmp.c index 51744127db66..3c5237d9cd1e 100644 --- a/arch/arm/mach-hisi/platsmp.c +++ b/arch/arm/mach-hisi/platsmp.c @@ -89,7 +89,7 @@ static int hi3xxx_boot_secondary(unsigned int cpu, struct task_struct *idle) return 0; } -struct smp_operations hi3xxx_smp_ops __initdata = { +static struct smp_operations hi3xxx_smp_ops __initdata = { .smp_prepare_cpus = hi3xxx_smp_prepare_cpus, .smp_boot_secondary = hi3xxx_boot_secondary, #ifdef CONFIG_HOTPLUG_CPU @@ -126,7 +126,7 @@ static int hix5hd2_boot_secondary(unsigned int cpu, struct task_struct *idle) } -struct smp_operations hix5hd2_smp_ops __initdata = { +static struct smp_operations hix5hd2_smp_ops __initdata = { .smp_prepare_cpus = hisi_common_smp_prepare_cpus, .smp_boot_secondary = hix5hd2_boot_secondary, #ifdef CONFIG_HOTPLUG_CPU @@ -176,7 +176,7 @@ static int hip01_boot_secondary(unsigned int cpu, struct task_struct *idle) return 0; } -struct smp_operations hip01_smp_ops __initdata = { +static struct smp_operations hip01_smp_ops __initdata = { .smp_prepare_cpus = hisi_common_smp_prepare_cpus, .smp_boot_secondary = hip01_boot_secondary, }; -- 2.30.2