3 files changed, 6 insertions, 6 deletions
diff --git a/src/cpu/inorder/inorder_dyn_inst.cc b/src/cpu/inorder/inorder_dyn_inst.cc
index aedc630f5..86dbdf97c 100644
--- a/src/cpu/inorder/inorder_dyn_inst.cc
+++ b/src/cpu/inorder/inorder_dyn_inst.cc
@@ -91,7 +91,7 @@ InOrderDynInst::InOrderDynInst(InOrderCPU *cpu,
 int InOrderDynInst::instcount = 0;
 
 int
-InOrderDynInst::cpuId()
+InOrderDynInst::cpuId() const
 {
     return cpu->cpuId();
 }
diff --git a/src/cpu/inorder/inorder_dyn_inst.hh b/src/cpu/inorder/inorder_dyn_inst.hh
index 48c15e292..578fd604a 100644
--- a/src/cpu/inorder/inorder_dyn_inst.hh
+++ b/src/cpu/inorder/inorder_dyn_inst.hh
@@ -357,10 +357,10 @@ class InOrderDynInst : public RefCounted
     Fault getFault() { return fault; }
 
     /** Read this CPU's ID. */
-    int cpuId();
+    int cpuId() const;
 
     /** Read this context's system-wide ID **/
-    int contextId() { return thread->contextId(); }
+    int contextId() const { return thread->contextId(); }
 
     ////////////////////////////////////////////////////////////
     //
diff --git a/src/cpu/inorder/thread_context.hh b/src/cpu/inorder/thread_context.hh
index b1a361027..96ec063c8 100644
--- a/src/cpu/inorder/thread_context.hh
+++ b/src/cpu/inorder/thread_context.hh
@@ -111,14 +111,14 @@ class InOrderThreadContext : public ThreadContext
     std::string getCpuName() { return cpu->name(); }
 
     /** Reads this CPU's ID. */
-    int cpuId() { return cpu->cpuId(); }
+    int cpuId() const { return cpu->cpuId(); }
 
-    int contextId() { return thread->contextId(); }
+    int contextId() const { return thread->contextId(); }
 
     void setContextId(int id) { thread->setContextId(id); }
 
     /** Returns this thread's ID number. */
-    int threadId() { return thread->threadId(); }
+    int threadId() const { return thread->threadId(); }
     void setThreadId(int id) { return thread->setThreadId(id); }
 
     uint64_t readMicroPC()