diff -r 20167772fb15 -r a18433b61df5 src/cpu/o3/thread_context_impl.hh
--- a/src/cpu/o3/thread_context_impl.hh Thu Jul 02 23:23:06 2009 -0700
+++ b/src/cpu/o3/thread_context_impl.hh Fri Jul 03 19:15:49 2009 +0100
@@ -54,8 +54,9 @@
 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