From: Kevin Lim <ktlim@umich.edu>
Date: Thu, 11 May 2006 19:19:48 +0000 (-0400)
Subject: Set memory properly.
X-Git-Tag: m5_2.0_beta1~36^2~108^2~33
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=92838fd35e4ffc00cc52aacfd2e5317ae7ab8b1b;p=gem5.git

Set memory properly.

--HG--
extra : convert_revision : 4e6c61d31bf052bb4aabf4bb7a4f0e870b44b771
---

diff --git a/cpu/cpu_exec_context.cc b/cpu/cpu_exec_context.cc
index 4400cf842..e15ba7e66 100644
--- a/cpu/cpu_exec_context.cc
+++ b/cpu/cpu_exec_context.cc
@@ -94,7 +94,7 @@ CPUExecContext::CPUExecContext(BaseCPU *_cpu, int _thread_num,
 
 CPUExecContext::CPUExecContext(BaseCPU *_cpu, int _thread_num,
                          FunctionalMemory *_mem, int _asid)
-    : cpu(_cpu), thread_num(_thread_num), process(0), mem(NULL), asid(_asid),
+    : cpu(_cpu), thread_num(_thread_num), process(0), mem(_mem), asid(_asid),
       func_exe_inst(0), storeCondFailures(0)
 {
     memset(&regs, 0, sizeof(RegFile));