diff options
| author | Kevin Lim <ktlim@umich.edu> | 2006-05-19 14:27:46 -0400 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2006-05-19 14:27:46 -0400 |
| commit | c7e7d07ec395156015e3baf52048c403d28a6442 (patch) | |
| tree | 962f00eb6a799e3ad0629fffc34d9879af28f007 /cpu/ozone/cpu_impl.hh | |
| parent | 36581a534240c322e1fc28b8bd6e8f13f2b0fefd (diff) | |
| download | gem5-c7e7d07ec395156015e3baf52048c403d28a6442.tar.xz | |
Fixes for regression build errors.
--HG--
extra : convert_revision : 1f59c853cb0e327d7cf586021b5139f1242e4f28
Diffstat (limited to 'cpu/ozone/cpu_impl.hh')
| -rw-r--r-- | cpu/ozone/cpu_impl.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpu/ozone/cpu_impl.hh b/cpu/ozone/cpu_impl.hh index b085f077f..031b4b145 100644 --- a/cpu/ozone/cpu_impl.hh +++ b/cpu/ozone/cpu_impl.hh @@ -934,8 +934,7 @@ OzoneCPU<Impl>::OzoneXC::takeOverFrom(ExecContext *old_context) setCpuId(old_context->readCpuId()); #if !FULL_SYSTEM setFuncExeInst(old_context->readFuncExeInst()); -#endif - +#else EndQuiesceEvent *other_quiesce = old_context->getQuiesceEvent(); if (other_quiesce) { // Point the quiesce event's XC at this XC so that it wakes up @@ -947,6 +946,7 @@ OzoneCPU<Impl>::OzoneXC::takeOverFrom(ExecContext *old_context) } // storeCondFailures = 0; cpu->lockFlag = false; +#endif old_context->setStatus(ExecContext::Unallocated); } |