Index: cpufunc.h
===================================================================
RCS file: /home/ncvs/src/sys/arm/include/cpufunc.h,v
retrieving revision 1.6
diff -u -p -r1.6 cpufunc.h
--- cpufunc.h	5 Jan 2005 21:58:48 -0000	1.6
+++ cpufunc.h	20 Feb 2005 03:20:32 -0000
@@ -322,19 +322,16 @@ void	arm9_setttb		(u_int);
 
 void	arm9_tlb_flushID_SE	(u_int va);
 
-void	arm9_cache_flushID	(void);
-void	arm9_cache_flushID_SE	(u_int);
-void	arm9_cache_flushI	(void);
-void	arm9_cache_flushI_SE	(u_int);
-void	arm9_cache_flushD	(void);
-void	arm9_cache_flushD_SE	(u_int);
-
-void	arm9_cache_cleanID	(void);
-
-void	arm9_cache_syncI	(void);
-void	arm9_cache_flushID_rng	(vm_offset_t, vm_size_t);
-void	arm9_cache_flushD_rng	(vm_offset_t, vm_size_t);
-void	arm9_cache_syncI_rng	(vm_offset_t, vm_size_t);
+void	arm9_icache_sync_all	__P((void));
+void	arm9_icache_sync_range	__P((vaddr_t, vsize_t));
+
+void	arm9_dcache_wbinv_all	__P((void));
+void	arm9_dcache_wbinv_range __P((vaddr_t, vsize_t));
+void	arm9_dcache_inv_range	__P((vaddr_t, vsize_t));
+void	arm9_dcache_wb_range	__P((vaddr_t, vsize_t));
+
+void	arm9_idcache_wbinv_all	__P((void));
+void	arm9_idcache_wbinv_range __P((vaddr_t, vsize_t));
 
 void	arm9_context_switch	(void);