Add cache operation functions pointers to struct cpu_info; the various

cache lines and sizes are already there, after all.

The ConfigCache cache routine is responsible for filling these function
pointers; cache routine invocation macros are updated to use the cpu_info
fields, but may still be overriden in <machine/cpu.h> on platforms where
only one set of cache routines is used.

1 files changed, 1 insertions, 16 deletions

diff --git a/sys/arch/sgi/include/cpu.h b/sys/arch/sgi/include/cpu.h
index 2aa2e9e4877..18181df485a 100644
--- a/sys/arch/sgi/include/cpu.h
+++ b/sys/arch/sgi/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.13 2012/04/21 12:20:30 miod Exp $ */
+/*	$OpenBSD: cpu.h,v 1.14 2012/06/24 16:26:04 miod Exp $ */
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -58,21 +58,6 @@ void hw_ipi_intr_clear(u_long);
 void hw_cpu_init_secondary(struct cpu_info *);
 #endif	/* MULTIPROCESSOR && !_LOCORE */
 
-/*
- * Define soft selected cache functions.
- */
-#define	Mips_SyncCache(ci)			\
-	(*(sys_config._SyncCache))((ci))
-#define	Mips_InvalidateICache(ci, va, l)	\
-	(*(sys_config._InvalidateICache))((ci), (va), (l))
-#define	Mips_SyncDCachePage(ci, va, pa)		\
-	(*(sys_config._SyncDCachePage))((ci), (va), (pa))
-#define	Mips_HitSyncDCache(ci, va, l)	\
-	(*(sys_config._HitSyncDCache))((ci), (va), (l))
-#define	Mips_IOSyncDCache(ci, va, l, h)	\
-	(*(sys_config._IOSyncDCache))((ci), (va), (l), (h))
-#define	Mips_HitInvalidateDCache(ci, va, l)	\
-	(*(sys_config._HitInvalidateDCache))((ci), (va), (l))
 
 #endif/* _KERNEL */