aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-11-14 20:39:52 -0500
committerArnd Bergmann <arnd@arndb.de>2015-12-01 16:17:13 -0500
commit635e958dad5639102fcf8acf2d8feb6a80c6e689 (patch)
treea8cbfafcd57834d77801a129db355e204430429d
parent31ade3b83e1821da5fbb2f11b5b3d4ab2ec39db8 (diff)
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 <yamada.masahiro@socionext.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Wei Xu <xuwei5@hisilicon.com>
-rw-r--r--arch/arm/mach-hisi/core.h3
-rw-r--r--arch/arm/mach-hisi/platsmp.c6
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 @@
6extern void hi3xxx_set_cpu_jump(int cpu, void *jump_addr); 6extern void hi3xxx_set_cpu_jump(int cpu, void *jump_addr);
7extern int hi3xxx_get_cpu_jump(int cpu); 7extern int hi3xxx_get_cpu_jump(int cpu);
8extern void secondary_startup(void); 8extern void secondary_startup(void);
9extern struct smp_operations hi3xxx_smp_ops;
10 9
11extern void hi3xxx_cpu_die(unsigned int cpu); 10extern void hi3xxx_cpu_die(unsigned int cpu);
12extern int hi3xxx_cpu_kill(unsigned int cpu); 11extern int hi3xxx_cpu_kill(unsigned int cpu);
13extern void hi3xxx_set_cpu(int cpu, bool enable); 12extern void hi3xxx_set_cpu(int cpu, bool enable);
14 13
15extern struct smp_operations hix5hd2_smp_ops;
16extern void hix5hd2_set_cpu(int cpu, bool enable); 14extern void hix5hd2_set_cpu(int cpu, bool enable);
17extern void hix5hd2_cpu_die(unsigned int cpu); 15extern void hix5hd2_cpu_die(unsigned int cpu);
18 16
19extern struct smp_operations hip01_smp_ops;
20extern void hip01_set_cpu(int cpu, bool enable); 17extern void hip01_set_cpu(int cpu, bool enable);
21extern void hip01_cpu_die(unsigned int cpu); 18extern void hip01_cpu_die(unsigned int cpu);
22#endif 19#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)
89 return 0; 89 return 0;
90} 90}
91 91
92struct smp_operations hi3xxx_smp_ops __initdata = { 92static struct smp_operations hi3xxx_smp_ops __initdata = {
93 .smp_prepare_cpus = hi3xxx_smp_prepare_cpus, 93 .smp_prepare_cpus = hi3xxx_smp_prepare_cpus,
94 .smp_boot_secondary = hi3xxx_boot_secondary, 94 .smp_boot_secondary = hi3xxx_boot_secondary,
95#ifdef CONFIG_HOTPLUG_CPU 95#ifdef CONFIG_HOTPLUG_CPU
@@ -126,7 +126,7 @@ static int hix5hd2_boot_secondary(unsigned int cpu, struct task_struct *idle)
126} 126}
127 127
128 128
129struct smp_operations hix5hd2_smp_ops __initdata = { 129static struct smp_operations hix5hd2_smp_ops __initdata = {
130 .smp_prepare_cpus = hisi_common_smp_prepare_cpus, 130 .smp_prepare_cpus = hisi_common_smp_prepare_cpus,
131 .smp_boot_secondary = hix5hd2_boot_secondary, 131 .smp_boot_secondary = hix5hd2_boot_secondary,
132#ifdef CONFIG_HOTPLUG_CPU 132#ifdef CONFIG_HOTPLUG_CPU
@@ -176,7 +176,7 @@ static int hip01_boot_secondary(unsigned int cpu, struct task_struct *idle)
176 return 0; 176 return 0;
177} 177}
178 178
179struct smp_operations hip01_smp_ops __initdata = { 179static struct smp_operations hip01_smp_ops __initdata = {
180 .smp_prepare_cpus = hisi_common_smp_prepare_cpus, 180 .smp_prepare_cpus = hisi_common_smp_prepare_cpus,
181 .smp_boot_secondary = hip01_boot_secondary, 181 .smp_boot_secondary = hip01_boot_secondary,
182}; 182};