diff options
| author | Steve Reinhardt <stever@eecs.umich.edu> | 2007-06-17 17:30:24 -0700 |
|---|---|---|
| committer | Steve Reinhardt <stever@eecs.umich.edu> | 2007-06-17 17:30:24 -0700 |
| commit | d69a763833f911cb2d7f97604108219b4da0b881 (patch) | |
| tree | 538d12c555824c931a3ceaedea5a2f46aa4e5212 /src/mem/cache/cache.cc | |
| parent | c2a97387cf543061bdb02f5259875b10a4dd6f74 (diff) | |
| parent | 35cf19d441ed15d054d00674ec67ab5bc769f6d7 (diff) | |
| download | gem5-d69a763833f911cb2d7f97604108219b4da0b881.tar.xz | |
Merge vm1.(none):/home/stever/bk/newmem-head
into vm1.(none):/home/stever/bk/newmem-cache2
configs/example/memtest.py:
Hand merge redundant changes.
--HG--
extra : convert_revision : a2e36be254bf052024f37bcb23b5209f367d37e1
Diffstat (limited to 'src/mem/cache/cache.cc')
| -rw-r--r-- | src/mem/cache/cache.cc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/mem/cache/cache.cc b/src/mem/cache/cache.cc index cb4e7f62e..96f9a2e11 100644 --- a/src/mem/cache/cache.cc +++ b/src/mem/cache/cache.cc @@ -58,10 +58,6 @@ #include "mem/cache/tags/split_lifo.hh" #endif -#include "mem/cache/miss/miss_queue.hh" -#include "mem/cache/miss/blocking_buffer.hh" - -#include "mem/cache/coherence/uni_coherence.hh" #include "mem/cache/coherence/simple_coherence.hh" #include "mem/cache/cache_impl.hh" @@ -72,27 +68,22 @@ #if defined(USE_CACHE_FALRU) template class Cache<FALRU, SimpleCoherence>; -template class Cache<FALRU, UniCoherence>; #endif #if defined(USE_CACHE_IIC) template class Cache<IIC, SimpleCoherence>; -template class Cache<IIC, UniCoherence>; #endif #if defined(USE_CACHE_LRU) template class Cache<LRU, SimpleCoherence>; -template class Cache<LRU, UniCoherence>; #endif #if defined(USE_CACHE_SPLIT) template class Cache<Split, SimpleCoherence>; -template class Cache<Split, UniCoherence>; #endif #if defined(USE_CACHE_SPLIT_LIFO) template class Cache<SplitLIFO, SimpleCoherence>; -template class Cache<SplitLIFO, UniCoherence>; #endif #endif //DOXYGEN_SHOULD_SKIP_THIS |