diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2007-07-24 15:48:40 -0700 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2007-07-24 15:48:40 -0700 |
commit | 26b1c455e0aed69eda0cc165b5084edb1b557c38 (patch) | |
tree | 0b7ffa9259c55f9a639a12f09ddef033d78b084b /src/mem/cache/coherence/coherence_protocol.hh | |
parent | 02c39000bfc6be620382bf89636e3b1bbb2f4cf6 (diff) | |
parent | abc76f20cb98c90e8dab416dd16dfd4a954013ba (diff) | |
download | gem5-26b1c455e0aed69eda0cc165b5084edb1b557c38.tar.xz |
Merge with head.
--HG--
extra : convert_revision : 4a34b3f91c4fc90055596245ae3efec45ea33888
Diffstat (limited to 'src/mem/cache/coherence/coherence_protocol.hh')
-rw-r--r-- | src/mem/cache/coherence/coherence_protocol.hh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mem/cache/coherence/coherence_protocol.hh b/src/mem/cache/coherence/coherence_protocol.hh index 775bc807a..e5d48ec2d 100644 --- a/src/mem/cache/coherence/coherence_protocol.hh +++ b/src/mem/cache/coherence/coherence_protocol.hh @@ -39,10 +39,11 @@ #include <string> -#include "sim/sim_object.hh" -#include "mem/packet.hh" -#include "mem/cache/cache_blk.hh" #include "base/statistics.hh" +#include "enums/Coherence.hh" +#include "mem/cache/cache_blk.hh" +#include "mem/packet.hh" +#include "sim/sim_object.hh" class BaseCache; class MSHR; @@ -60,7 +61,7 @@ class CoherenceProtocol : public SimObject * @param protocol The string representation of the protocol to use. * @param doUpgrades True if bus upgrades should be used. */ - CoherenceProtocol(const std::string &name, const std::string &protocol, + CoherenceProtocol(const std::string &name, Enums::Coherence protocol, const bool doUpgrades); /** |