summaryrefslogtreecommitdiff
path: root/src/mem/cache/miss/blocking_buffer.hh
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2006-10-09 18:19:35 -0400
committerGabe Black <gblack@eecs.umich.edu>2006-10-09 18:19:35 -0400
commita23c6a719323f2ac74cadd3b04c84f3dc679c26e (patch)
tree73e081aa0b1868834e8cf4ec98ce5254c6b5192e /src/mem/cache/miss/blocking_buffer.hh
parent187dcb18bfd87db63ad914d2ba04f0bd2dc0637d (diff)
parent727dea78c4b603a63d6c8bee10d317cb2905ffd4 (diff)
downloadgem5-a23c6a719323f2ac74cadd3b04c84f3dc679c26e.tar.xz
Merge zizzer.eecs.umich.edu:/bk/newmem
into zeep.eecs.umich.edu:/home/gblack/m5/newmem_bus --HG-- extra : convert_revision : 8267487b935eaf11665841ace3a5c664751b53b0
Diffstat (limited to 'src/mem/cache/miss/blocking_buffer.hh')
-rw-r--r--src/mem/cache/miss/blocking_buffer.hh2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mem/cache/miss/blocking_buffer.hh b/src/mem/cache/miss/blocking_buffer.hh
index 641d5a798..f7069696c 100644
--- a/src/mem/cache/miss/blocking_buffer.hh
+++ b/src/mem/cache/miss/blocking_buffer.hh
@@ -152,7 +152,7 @@ public:
* are successfully sent.
* @param pkt The request that was sent on the bus.
*/
- void markInService(Packet * &pkt);
+ void markInService(Packet * &pkt, MSHR* mshr);
/**
* Frees the resources of the pktuest and unblock the cache.