CPU: Make the cpuid parameter get set in SE mode as well.

--HG--
extra : convert_revision : bc47206acb683ebaaa31f57af79b4b8db64e4d31

diff --git a/src/cpu/o3/checker_builder.cc b/src/cpu/o3/checker_builder.cc
index baa604962b0fb370a5aea71a1654ae5e56eb6888..b9afb3f9fec2a9519617a4f0a847502a0d167c2d 100644 (file)
--- a/src/cpu/o3/checker_builder.cc
+++ b/src/cpu/o3/checker_builder.cc
@@ -89,8 +89,8 @@ O3CheckerParams::create()
     params->itb = itb;
     params->dtb = dtb;
     params->system = system;
-#if FULL_SYSTEM
     params->cpu_id = cpu_id;
+#if FULL_SYSTEM
     params->profile = profile;
 #else
     params->process = workload;

diff --git a/src/cpu/ozone/checker_builder.cc b/src/cpu/ozone/checker_builder.cc
index eacec64618a04943362cc7a9a50840decdd6a878..37b9f951a2a4c2bd8842e9c08fd17b58fcc8ec7b 100644 (file)
--- a/src/cpu/ozone/checker_builder.cc
+++ b/src/cpu/ozone/checker_builder.cc
@@ -90,8 +90,8 @@ OzoneCheckerParams::create()
     params->itb = itb;
     params->dtb = dtb;
     params->system = system;
-#if FULL_SYSTEM
     params->cpu_id = cpu_id;
+#if FULL_SYSTEM
     params->profile = profile;
 #else
     params->process = workload;

diff --git a/src/cpu/ozone/cpu_builder.cc b/src/cpu/ozone/cpu_builder.cc
index 9273703399d2af7026b922032d301f0616953376..beb179d41fc21a3854156c64c794b648d53626cc 100644 (file)
--- a/src/cpu/ozone/cpu_builder.cc
+++ b/src/cpu/ozone/cpu_builder.cc
@@ -83,8 +83,8 @@ DerivOzoneCPUParams::create()
     params->dtb = dtb;
 
     params->system = system;
-#if FULL_SYSTEM
     params->cpu_id = cpu_id;
+#if FULL_SYSTEM
     params->profile = profile;
     params->do_quiesce = do_quiesce;
     params->do_checkpoint_insts = do_checkpoint_insts;

diff --git a/src/cpu/ozone/simple_cpu_builder.cc b/src/cpu/ozone/simple_cpu_builder.cc
index 23f5455e482c1ff83ff7b63bb531ac6c05314ca4..9cd56fdb40f329a8c3f05dc816f81237ec79043c 100644 (file)
--- a/src/cpu/ozone/simple_cpu_builder.cc
+++ b/src/cpu/ozone/simple_cpu_builder.cc
@@ -86,9 +86,8 @@ SimpleOzoneCPUParams::create()
     params->dtb = dtb;
 
     params->system = system;
-#if FULL_SYSTEM
     params->cpu_id = cpu_id;
-#else
+#if !FULL_SYSTEM
     params->workload = workload;
 //    params->pTable = page_table;
 #endif // FULL_SYSTEM