Simplified the way Cachegrind configures the caches;  it was really
strange before.  Also aborting if any command-line-provided cache
configuration is unacceptable, rather than falling back on defaults;
it's simpler and arguably better than just emitting a warning.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3118 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/cachegrind/cg_arch.h b/cachegrind/cg_arch.h
index 71ed2bd..c12e0d9 100644
--- a/cachegrind/cg_arch.h
+++ b/cachegrind/cg_arch.h
@@ -38,9 +38,10 @@
     int line_size;  // bytes
 } cache_t;
 
+// Gives the configuration of I1, D1 and L2 caches.  They get overridden
+// by any cache configurations specified on the command line.
 void VGA_(configure_caches)(cache_t* I1c, cache_t* D1c, cache_t* L2c,
-                         cache_t* I1_dflt, cache_t* D1_dflt, cache_t* L2_dflt,
-                         Bool all_caches_clo_defined);
+                            Bool all_caches_clo_defined);
 
 #endif   // __CG_ARCH_H