2 files changed, 0 insertions, 27 deletions
diff --git a/src/mem/ruby/system/Sequencer.cc b/src/mem/ruby/system/Sequencer.cc
index 87fbc66b5..fa5b75eb3 100644
--- a/src/mem/ruby/system/Sequencer.cc
+++ b/src/mem/ruby/system/Sequencer.cc
@@ -627,26 +627,6 @@ void Sequencer::hitCallback(const CacheMsg& request, DataBlock& data, GenericMac
   }
 }
 
-void Sequencer::readConflictCallback(const Address& address) {
-  std::cout << __FILE__ << "(" << __LINE__ << "): Not implemented. " << std::endl;
-}
-
-void Sequencer::readConflictCallback(const Address& address, GenericMachineType respondingMach, int thread) {
-  std::cout << __FILE__ << "(" << __LINE__ << "): Not implemented. " << std::endl;
-}
-
-void Sequencer::writeConflictCallback(const Address& address) {
-  std::cout << __FILE__ << "(" << __LINE__ << "): Not implemented. " << std::endl;
-}
-
-void Sequencer::writeConflictCallback(const Address& address, GenericMachineType respondingMach, int thread) {
-  std::cout << __FILE__ << "(" << __LINE__ << "): Not implemented. " << std::endl;
-}
-
-void Sequencer::conflictCallback(const CacheMsg& request, GenericMachineType respondingMach, int thread) {
-  std::cout << __FILE__ << "(" << __LINE__ << "): Not implemented. " << std::endl;
-}
-
 void Sequencer::printDebug(){
   //notify driver of debug
   g_system_ptr->getDriver()->printDebug();
diff --git a/src/mem/ruby/system/Sequencer.hh b/src/mem/ruby/system/Sequencer.hh
index 63e02817f..f4cc03131 100644
--- a/src/mem/ruby/system/Sequencer.hh
+++ b/src/mem/ruby/system/Sequencer.hh
@@ -83,13 +83,6 @@ public:
   CacheMsg & getReadRequest( const Address & addr, int thread );
   CacheMsg & getWriteRequest( const Address & addr, int thread );
 
-  // called by Ruby when transaction completes
-  void writeConflictCallback(const Address& address);
-  void readConflictCallback(const Address& address);
-  void writeConflictCallback(const Address& address, GenericMachineType respondingMach, int thread);
-  void readConflictCallback(const Address& address, GenericMachineType respondingMach, int thread);
-  void conflictCallback(const CacheMsg& request, GenericMachineType respondingMach, int thread);
-
   void writeCallback(const Address& address, DataBlock& data);
   void readCallback(const Address& address, DataBlock& data);
   void writeCallback(const Address& address);