1a2,13
> * Copyright (c) 2012 ARM Limited
> * All rights reserved.
> *
> * The license below extends only to copyright in the software and shall
> * not be construed as granting a license to any other intellectual
> * property including but not limited to intellectual property relating
> * to a hardware implementation of the functionality of the software
> * licensed hereunder. You may use the software subject to the license
> * terms below provided that you ensure that this notice is replicated
> * unmodified and in its entirety in all distributions of the software,
> * modified or unmodified, in source code or in binary form.
> *
228c240
< * @return The result of the access.
---
> * @param fromCpuSide from the CPU side port or the memory side port
230,231c242
< void functionalAccess(PacketPtr pkt, CachePort *incomingPort,
< CachePort *otherSidePort);
---
> void functionalAccess(PacketPtr pkt, bool fromCpuSide);