diff options
| -rw-r--r-- | src/dev/net/SConscript | 3 | ||||
| -rw-r--r-- | src/dev/net/dist_iface.cc | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/dev/net/SConscript b/src/dev/net/SConscript index e39df9d1c..908dd44e6 100644 --- a/src/dev/net/SConscript +++ b/src/dev/net/SConscript @@ -44,9 +44,6 @@ Import('*') -if env['TARGET_ISA'] == 'null': - Return() - SimObject('Ethernet.py') # Basic Ethernet infrastructure diff --git a/src/dev/net/dist_iface.cc b/src/dev/net/dist_iface.cc index 7eef5d841..ded8901aa 100644 --- a/src/dev/net/dist_iface.cc +++ b/src/dev/net/dist_iface.cc @@ -869,11 +869,13 @@ DistIface::toggleSync(ThreadContext *tc) // stop point. Suspend execution of all local thread contexts. // Dist-gem5 will reactivate all thread contexts when everyone has // reached the sync stop point. +#if THE_ISA != NULL_ISA for (int i = 0; i < master->sys->numContexts(); i++) { ThreadContext *tc = master->sys->getThreadContext(i); if (tc->status() == ThreadContext::Active) tc->quiesce(); } +#endif } else { inform("Request toggling syncronization on\n"); master->syncEvent->start(); @@ -882,11 +884,13 @@ DistIface::toggleSync(ThreadContext *tc) // nodes to prevent causality errors. We can also schedule CPU // activation here, since we know exactly when the next sync will // occur. +#if THE_ISA != NULL_ISA for (int i = 0; i < master->sys->numContexts(); i++) { ThreadContext *tc = master->sys->getThreadContext(i); if (tc->status() == ThreadContext::Active) tc->quiesceTick(master->syncEvent->when() + 1); } +#endif } } |