2c2
< * Copyright (c) 2010-2018 ARM Limited
---
> * Copyright (c) 2010-2019 ARM Limited
788a789,793
>
> // this response did not allocate here and therefore
> // it was not consumed, make sure that any flags are
> // carried over to cache above
> tgt_pkt->copyResponderFlags(pkt);
968d972
< bool alreadyResponded = pkt->cacheResponding();
986,995d989
< if (snoopPkt.cacheResponding()) {
< // cache-to-cache response from some upper cache
< assert(!alreadyResponded);
< pkt->setCacheResponding();
< }
< // upstream cache has the block, or has an outstanding
< // MSHR, pass the flag on
< if (snoopPkt.hasSharers()) {
< pkt->setHasSharers();
< }
1006a1001,1004
>
> // Copy over flags from the snoop response to make sure we
> // inform the final destination
> pkt->copyResponderFlags(&snoopPkt);
1007a1006
> bool already_responded = pkt->cacheResponding();
1009c1008
< if (!alreadyResponded && pkt->cacheResponding()) {
---
> if (!already_responded && pkt->cacheResponding()) {