From bf7c01d43d2a9e415ed3cc6cf310e76109ce6844 Mon Sep 17 00:00:00 2001
From: Ali Saidi <saidi@eecs.umich.edu>
Date: Wed, 5 Sep 2007 17:12:41 -0400
Subject: Bus: Fix drain code; old method could return 1 in atomic mode and
 never call de->process().

--HG--
extra : convert_revision : 35990e5eaf93f7a95a0ec72e9f92034a042def3e
---
 src/mem/bus.cc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/mem/bus.cc')

diff --git a/src/mem/bus.cc b/src/mem/bus.cc
index cc3504e83..6e790e438 100644
--- a/src/mem/bus.cc
+++ b/src/mem/bus.cc
@@ -613,12 +613,11 @@ Bus::drain(Event * de)
     //We should check that we're not "doing" anything, and that noone is
     //waiting. We might be idle but have someone waiting if the device we
     //contacted for a retry didn't actually retry.
-    if (curTick >= tickNextIdle && retryList.size() == 0) {
-        return 0;
-    } else {
+    if (retryList.size() || (curTick < tickNextIdle && busIdle.scheduled())) {
         drainEvent = de;
         return 1;
     }
+    return 0;
 }
 
 void
-- 
cgit v1.2.3