Make the arm cpu setup functions static. Any other place that needs these

functions will use the function pointer we create for them.

2 files changed, 17 insertions, 12 deletions

diff --git a/sys/arm/arm/cpufunc.c b/sys/arm/arm/cpufunc.c
index 2e85b559ee70..fe5efbaa1abb 100644
--- a/sys/arm/arm/cpufunc.c
+++ b/sys/arm/arm/cpufunc.c
@@ -81,6 +81,19 @@ u_int	arm_cache_type[14];
 u_int	arm_cache_loc;
 
 #if defined(CPU_ARM9E)
+static void arm10_setup(void);
+#endif
+#ifdef CPU_MV_PJ4B
+static void pj4bv7_setup(void);
+#endif
+#if defined(CPU_ARM1176)
+static void arm11x6_setup(void);
+#endif
+#if defined(CPU_CORTEXA) || defined(CPU_KRAIT)
+static void cortexa_setup(void);
+#endif
+
+#if defined(CPU_ARM9E)
 struct cpu_functions armv5_ec_cpufuncs = {
 	/* CPU functions */
 
@@ -473,7 +486,7 @@ out:
  */
 
 #if defined(CPU_ARM9E)
-void
+static void
 arm10_setup(void)
 {
 	int cpuctrl, cpuctrlmask;
@@ -544,7 +557,7 @@ cpu_scc_setup_ccnt(void)
 #endif
 
 #if defined(CPU_ARM1176)
-void
+static void
 arm11x6_setup(void)
 {
 	uint32_t auxctrl, auxctrl_wax;
@@ -576,7 +589,7 @@ arm11x6_setup(void)
 #endif  /* CPU_ARM1176 */
 
 #ifdef CPU_MV_PJ4B
-void
+static void
 pj4bv7_setup(void)
 {
 
@@ -586,8 +599,7 @@ pj4bv7_setup(void)
 #endif /* CPU_MV_PJ4B */
 
 #if defined(CPU_CORTEXA) || defined(CPU_KRAIT)
-
-void
+static void
 cortexa_setup(void)
 {
 
diff --git a/sys/arm/include/cpufunc.h b/sys/arm/include/cpufunc.h
index e0eb9b665830..916d0859d371 100644
--- a/sys/arm/include/cpufunc.h
+++ b/sys/arm/include/cpufunc.h
@@ -220,8 +220,6 @@ u_int	cpu_pfr			(int);
 void	arm9_tlb_flushID_SE	(u_int va);
 void	arm9_context_switch	(void);
 
-void	arm10_setup		(void);
-
 u_int	sheeva_control_ext 		(u_int, u_int);
 void	sheeva_cpu_sleep		(int);
 void	sheeva_setttb			(u_int);
@@ -238,17 +236,12 @@ void	sheeva_l2cache_wbinv_all	(void);
 
 #if defined(CPU_CORTEXA) || defined(CPU_MV_PJ4B) || defined(CPU_KRAIT)
 void	armv7_cpu_sleep			(int);
-void	armv7_setup			(void);
-
-void 	cortexa_setup			(void);
 #endif
 #if defined(CPU_MV_PJ4B)
 void	pj4b_config			(void);
-void	pj4bv7_setup			(void);
 #endif
 
 #if defined(CPU_ARM1176)
-void    arm11x6_setup                   (void);
 void    arm11x6_sleep                   (int);  /* no ref. for errata */
 #endif