Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 29 Jan 2016 17:43:03 +0000 (UTC)
From:      Svatopluk Kraus <skra@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r295049 - in head/sys/arm: arm include
Message-ID:  <201601291743.u0THh36b084081@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: skra
Date: Fri Jan 29 17:43:03 2016
New Revision: 295049
URL: https://svnweb.freebsd.org/changeset/base/295049

Log:
  Retire pmap_pte_init_mmu_v6() which was used by old pmap-v6.

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

Modified: head/sys/arm/arm/cpufunc.c
==============================================================================
--- head/sys/arm/arm/cpufunc.c	Fri Jan 29 17:33:37 2016	(r295048)
+++ head/sys/arm/arm/cpufunc.c	Fri Jan 29 17:43:03 2016	(r295049)
@@ -889,9 +889,6 @@ set_cpufuncs()
 		cpufuncs = arm1176_cpufuncs;
 		cpu_reset_needs_v4_MMU_disable = 1;     /* V4 or higher */
 		get_cachetype_cp15();
-
-		pmap_pte_init_mmu_v6();
-
 		goto out;
 	}
 #endif /* CPU_ARM1176 */
@@ -915,8 +912,6 @@ set_cpufuncs()
 		cpufuncs = cortexa_cpufuncs;
 		cpu_reset_needs_v4_MMU_disable = 1;     /* V4 or higher */
 		get_cachetype_cp15();
-
-		pmap_pte_init_mmu_v6();
 		goto out;
 	}
 #endif /* CPU_CORTEXA */
@@ -927,7 +922,6 @@ set_cpufuncs()
 	    cputype == CPU_ID_ARM_88SV581X_V7) {
 		cpufuncs = pj4bv7_cpufuncs;
 		get_cachetype_cp15();
-		pmap_pte_init_mmu_v6();
 		goto out;
 	}
 #endif /* CPU_MV_PJ4B */

Modified: head/sys/arm/arm/pmap-v6.c
==============================================================================
--- head/sys/arm/arm/pmap-v6.c	Fri Jan 29 17:33:37 2016	(r295048)
+++ head/sys/arm/arm/pmap-v6.c	Fri Jan 29 17:43:03 2016	(r295049)
@@ -6278,11 +6278,6 @@ pte1_setrw:
 }
 
 /* !!!! REMOVE !!!! */
-void
-pmap_pte_init_mmu_v6(void)
-{
-}
-
 void vector_page_setprot(int p)
 {
 }

Modified: head/sys/arm/include/pmap-v6.h
==============================================================================
--- head/sys/arm/include/pmap-v6.h	Fri Jan 29 17:33:37 2016	(r295048)
+++ head/sys/arm/include/pmap-v6.h	Fri Jan 29 17:43:03 2016	(r295049)
@@ -268,7 +268,6 @@ void pmap_devmap_bootstrap(const struct 
 /*
  * sys/arm/arm/cpufunc.c
  */
-void pmap_pte_init_mmu_v6(void);
 void vector_page_setprot(int);
 
 /*

Modified: head/sys/arm/include/pmap.h
==============================================================================
--- head/sys/arm/include/pmap.h	Fri Jan 29 17:33:37 2016	(r295048)
+++ head/sys/arm/include/pmap.h	Fri Jan 29 17:43:03 2016	(r295049)
@@ -624,9 +624,6 @@ void	pmap_copy_page_generic(vm_paddr_t, 
 void	pmap_zero_page_generic(vm_paddr_t, int, int);
 
 void	pmap_pte_init_generic(void);
-#if (ARM_MMU_V6 + ARM_MMU_V7) != 0
-void	pmap_pte_init_mmu_v6(void);
-#endif /* (ARM_MMU_V6 + ARM_MMU_V7) != 0 */
 #endif /* (ARM_MMU_GENERIC + ARM_MMU_V6 + ARM_MMU_V7) != 0 */
 
 #if ARM_MMU_XSCALE == 1

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601291743.u0THh36b084081>