From a2077ccf026f4587bf097274b241aa2c78c096e9 Mon Sep 17 00:00:00 2001
From: Andreas Sandberg <Andreas.Sandberg@ARM.com>
Date: Mon, 7 Jan 2013 13:05:45 -0500
Subject: [PATCH] o3 cpu: Remove unused variables

---
 src/cpu/o3/cpu.cc                 | 3 ---
 src/cpu/o3/cpu.hh                 | 8 --------
 src/cpu/o3/thread_context_impl.hh | 1 -
 3 files changed, 12 deletions(-)

diff --git a/src/cpu/o3/cpu.cc b/src/cpu/o3/cpu.cc
index 54c55f8c7..724d88405 100644
--- a/src/cpu/o3/cpu.cc
+++ b/src/cpu/o3/cpu.cc
@@ -467,9 +467,6 @@ FullO3CPU<Impl>::FullO3CPU(DerivO3CPUParams *params)
 
     for (ThreadID tid = 0; tid < this->numThreads; tid++)
         this->thread[tid]->setFuncExeInst(0);
-
-    lockAddr = 0;
-    lockFlag = false;
 }
 
 template <class Impl>
diff --git a/src/cpu/o3/cpu.hh b/src/cpu/o3/cpu.hh
index c6083d8d5..890598b0f 100644
--- a/src/cpu/o3/cpu.hh
+++ b/src/cpu/o3/cpu.hh
@@ -124,9 +124,6 @@ class FullO3CPU : public BaseO3CPU
     /** Overall CPU status. */
     Status _status;
 
-    /** Per-thread status in CPU, used for SMT.  */
-    Status _threadStatus[Impl::MaxThreads];
-
   private:
 
     /**
@@ -781,11 +778,6 @@ class FullO3CPU : public BaseO3CPU
     /** Get the dcache port (used to find block size for translations). */
     virtual CpuPort &getDataPort() { return dcachePort; }
 
-    Addr lockAddr;
-
-    /** Temporary fix for the lock flag, works in the UP case. */
-    bool lockFlag;
-
     /** Stat for total number of times the CPU is descheduled. */
     Stats::Scalar timesIdled;
     /** Stat for total number of cycles the CPU spends descheduled. */
diff --git a/src/cpu/o3/thread_context_impl.hh b/src/cpu/o3/thread_context_impl.hh
index 2de6dbc1b..0a8dfeb3e 100755
--- a/src/cpu/o3/thread_context_impl.hh
+++ b/src/cpu/o3/thread_context_impl.hh
@@ -89,7 +89,6 @@ O3ThreadContext<Impl>::takeOverFrom(ThreadContext *old_context)
 
         // Transfer kernel stats from one CPU to the other.
         thread->kernelStats = old_context->getKernelStats();
-        cpu->lockFlag = false;
     } else {
         thread->funcExeInst = old_context->readFuncExeInst();
     }
-- 
2.30.2