svn commit: r337850 - in head/sys/arm: arm include

[Andrew Turner]

Author: andrew
Date: Wed Aug 15 14:45:01 2018
New Revision: 337850
URL: https://svnweb.freebsd.org/changeset/base/337850

Log:
  Make code and data only used within the arm pmap code as static.
  
  Sponsored by:	DARPA, AFRL

Modified:
  head/sys/arm/arm/pmap-v4.c
  head/sys/arm/include/pmap-v4.h

Modified: head/sys/arm/arm/pmap-v4.c
==============================================================================
--- head/sys/arm/arm/pmap-v4.c	Wed Aug 15 14:41:24 2018	(r337849)
+++ head/sys/arm/arm/pmap-v4.c	Wed Aug 15 14:45:01 2018	(r337850)
@@ -240,17 +240,17 @@ static void		pmap_init_l1(struct l1_ttable *, pd_entry
  * them (though, they shouldn't).
  */
 
-pt_entry_t	pte_l1_s_cache_mode;
-pt_entry_t	pte_l1_s_cache_mode_pt;
-pt_entry_t	pte_l1_s_cache_mask;
+static pt_entry_t	pte_l1_s_cache_mode;
+static pt_entry_t	pte_l1_s_cache_mode_pt;
+static pt_entry_t	pte_l1_s_cache_mask;
 
-pt_entry_t	pte_l2_l_cache_mode;
-pt_entry_t	pte_l2_l_cache_mode_pt;
-pt_entry_t	pte_l2_l_cache_mask;
+static pt_entry_t	pte_l2_l_cache_mode;
+static pt_entry_t	pte_l2_l_cache_mode_pt;
+static pt_entry_t	pte_l2_l_cache_mask;
 
-pt_entry_t	pte_l2_s_cache_mode;
-pt_entry_t	pte_l2_s_cache_mode_pt;
-pt_entry_t	pte_l2_s_cache_mask;
+static pt_entry_t	pte_l2_s_cache_mode;
+static pt_entry_t	pte_l2_s_cache_mode_pt;
+static pt_entry_t	pte_l2_s_cache_mask;
 
 /*
  * Crashdump maps.
@@ -3752,7 +3752,7 @@ pmap_remove(pmap_t pm, vm_offset_t sva, vm_offset_t ev
  * StrongARM accesses to non-cached pages are non-burst making writing
  * _any_ bulk data very slow.
  */
-void
+static void
 pmap_zero_page_generic(vm_paddr_t phys, int off, int size)
 {
 
@@ -3909,7 +3909,7 @@ pmap_clean_page(struct pv_entry *pv, boolean_t is_src)
  * hook points. The same comment regarding cachability as in
  * pmap_zero_page also applies here.
  */
-void
+static void
 pmap_copy_page_generic(vm_paddr_t src, vm_paddr_t dst)
 {
 #if 0

Modified: head/sys/arm/include/pmap-v4.h
==============================================================================
--- head/sys/arm/include/pmap-v4.h	Wed Aug 15 14:41:24 2018	(r337849)
+++ head/sys/arm/include/pmap-v4.h	Wed Aug 15 14:45:01 2018	(r337850)
@@ -379,27 +379,6 @@ do {									\
 		cpu_drain_writebuf();					\
 } while (/*CONSTCOND*/0)
 
-extern pt_entry_t		pte_l1_s_cache_mode;
-extern pt_entry_t		pte_l1_s_cache_mask;
-
-extern pt_entry_t		pte_l2_l_cache_mode;
-extern pt_entry_t		pte_l2_l_cache_mask;
-
-extern pt_entry_t		pte_l2_s_cache_mode;
-extern pt_entry_t		pte_l2_s_cache_mask;
-
-extern pt_entry_t		pte_l1_s_cache_mode_pt;
-extern pt_entry_t		pte_l2_l_cache_mode_pt;
-extern pt_entry_t		pte_l2_s_cache_mode_pt;
-
-extern void (*pmap_copy_page_func)(vm_paddr_t, vm_paddr_t);
-extern void (*pmap_copy_page_offs_func)(vm_paddr_t a_phys,
-    vm_offset_t a_offs, vm_paddr_t b_phys, vm_offset_t b_offs, int cnt);
-extern void (*pmap_zero_page_func)(vm_paddr_t, int, int);
-
-void	pmap_copy_page_generic(vm_paddr_t, vm_paddr_t);
-void	pmap_zero_page_generic(vm_paddr_t, int, int);
-
 void	pmap_pte_init_generic(void);
 
 #if defined(CPU_XSCALE_81342)