From be28d96510e0e722db83b26f1a12d3f5de979b32 Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Wed, 6 Apr 2016 19:43:31 +0100 Subject: Revert power patch sets with unexpected interactions The following patches had unexpected interactions with the current upstream code and have been reverted for now: e07fd01651f3: power: Add support for power models 831c7f2f9e39: power: Low-power idle power state for idle CPUs 4f749e00b667: power: Add power states to ClockedObject Signed-off-by: Andreas Sandberg --HG-- extra : amend_source : 0b6fb073c6bbc24be533ec431eb51fbf1b269508 --- src/sim/clocked_object.cc | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'src/sim/clocked_object.cc') diff --git a/src/sim/clocked_object.cc b/src/sim/clocked_object.cc index e679f03a0..9a682a4ce 100644 --- a/src/sim/clocked_object.cc +++ b/src/sim/clocked_object.cc @@ -41,17 +41,6 @@ #include "sim/clocked_object.hh" #include "base/misc.hh" -#include "sim/power/power_model.hh" - -ClockedObject::ClockedObject(const ClockedObjectParams *p) : - SimObject(p), Clocked(*p->clk_domain), - _currPwrState(p->default_p_state), - prvEvalTick(0) -{ - // Register the power_model with the object - if (p->power_model) - p->power_model->setClockedObject(this); -} void ClockedObject::serialize(CheckpointOut &cp) const -- cgit v1.2.3