From be28d96510e0e722db83b26f1a12d3f5de979b32 Mon Sep 17 00:00:00 2001
From: Andreas Sandberg <andreas.sandberg@arm.com>
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 <andreas.sandberg@arm.com>

--HG--
extra : amend_source : 0b6fb073c6bbc24be533ec431eb51fbf1b269508
---
 ext/sst/ExtMaster.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ext')

diff --git a/ext/sst/ExtMaster.cc b/ext/sst/ExtMaster.cc
index ce6f8ab7b..26a6c4a09 100644
--- a/ext/sst/ExtMaster.cc
+++ b/ext/sst/ExtMaster.cc
@@ -177,7 +177,7 @@ ExtMaster::handleEvent(SST::Event* event)
     }
 
     auto req = new Request(ev->getAddr(), ev->getSize(), flags, 0);
-    req->setContext(ev->getGroupId());
+    req->setThreadContext(ev->getGroupId(), 0);
 
     auto pkt = new Packet(req, cmdO);
     pkt->allocate();
-- 
cgit v1.2.3