From 96767fc7210e952d5874433b7f79a055c9bd692d Mon Sep 17 00:00:00 2001
From: "Timothy M. Jones" <tjones1@inf.ed.ac.uk>
Date: Wed, 23 Jun 2010 00:53:17 +0100
Subject: [PATCH] O3ThreadContext: When taking over from a previous context,
 only assert that the system pointers match in Full System mode.

---
 src/cpu/o3/thread_context_impl.hh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/cpu/o3/thread_context_impl.hh b/src/cpu/o3/thread_context_impl.hh
index 940d460ce..a1a96933a 100755
--- a/src/cpu/o3/thread_context_impl.hh
+++ b/src/cpu/o3/thread_context_impl.hh
@@ -55,8 +55,9 @@ void
 O3ThreadContext<Impl>::takeOverFrom(ThreadContext *old_context)
 {
     // some things should already be set up
+#if FULL_SYSTEM
     assert(getSystemPtr() == old_context->getSystemPtr());
-#if !FULL_SYSTEM
+#else
     assert(getProcessPtr() == old_context->getProcessPtr());
 #endif