From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Sat, 23 Jun 2007 20:26:30 +0000 (-0700)
Subject: Merge vm1.(none):/home/stever/bk/newmem-head
X-Git-Tag: m5_2.0_beta4~195^2~50^2~36
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=245b0bd9b94bfaaa188b7e945f91c0e4a9909cbe;p=gem5.git

Merge vm1.(none):/home/stever/bk/newmem-head
into  vm1.(none):/home/stever/bk/newmem-cache2

src/base/traceflags.py:
    Hand merge.

--HG--
extra : convert_revision : 9e7539eeab4220ed7a7237457a8f336f79216924
---

245b0bd9b94bfaaa188b7e945f91c0e4a9909cbe
diff --cc src/base/traceflags.py
index f4cf7dfd7,fddb86328..70fadb210
--- a/src/base/traceflags.py
+++ b/src/base/traceflags.py
@@@ -128,7 -128,7 +128,8 @@@ baseFlags = 
      'Mbox',
      'MemDepUnit',
      'MemoryAccess',
 +    'MemTest',
+     'MipsPRA',
      'O3CPU',
      'OzoneCPU',
      'OzoneLSQ',