Module Name: src
Committed By: matt
Date: Mon Apr 7 20:38:52 UTC 2014
Modified Files:
src/sys/arch/arm/include: cpufunc.h
Log Message:
Declare armv7 routines if CPU_ARMV7 is defined.
Rearrange in less random manner.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/arm/include/cpufunc.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/include/cpufunc.h
diff -u src/sys/arch/arm/include/cpufunc.h:1.70 src/sys/arch/arm/include/cpufunc.h:1.71
--- src/sys/arch/arm/include/cpufunc.h:1.70 Sat Mar 29 23:44:37 2014
+++ src/sys/arch/arm/include/cpufunc.h Mon Apr 7 20:38:52 2014
@@ -470,7 +470,7 @@ void armv6_idcache_wbinv_all (void);
void armv6_idcache_wbinv_range (vaddr_t, vsize_t);
#endif
-#if defined(CPU_CORTEX)
+#if defined(CPU_ARMV7)
#if defined(ARM_MMU_EXTENDED)
void armv7_setttb(u_int, tlb_asid_t);
void armv7_context_switch(u_int, tlb_asid_t);
@@ -480,12 +480,15 @@ void armv7_context_switch(u_int);
#endif
void armv7_icache_sync_range(vaddr_t, vsize_t);
+void armv7_icache_sync_all(void);
+
+void armv7_dcache_inv_range(vaddr_t, vsize_t);
void armv7_dcache_wb_range(vaddr_t, vsize_t);
void armv7_dcache_wbinv_range(vaddr_t, vsize_t);
-void armv7_dcache_inv_range(vaddr_t, vsize_t);
-void armv7_idcache_wbinv_range(vaddr_t, vsize_t);
+void armv7_dcache_wbinv_all(void);
-void armv7_icache_sync_all(void);
+void armv7_idcache_wbinv_range(vaddr_t, vsize_t);
+void armv7_idcache_wbinv_all(void);
void armv7_tlb_flushID(void);
void armv7_tlb_flushI(void);
@@ -498,12 +501,7 @@ void armv7_tlb_flushD_SE(vaddr_t);
void armv7_cpu_sleep(int);
void armv7_drain_writebuf(void);
void armv7_setup(char *string);
-#endif
-
-#if defined(CPU_CORTEX) || defined(CPU_PJ4B)
-void armv7_dcache_wbinv_all(void);
-void armv7_idcache_wbinv_all(void);
-#endif
+#endif /* CPU_ARMV7 */
#if defined(CPU_PJ4B)
#if defined(ARM_MMU_EXTENDED)
