2c2
< * Copyright (c) 2013-2014 ARM Limited
---
> * Copyright (c) 2013-2014,2017 ARM Limited
681a682,684
> /* Cache maintenance instructions go down via the store path *
> * but they carry no data and they shouldn't be considered for
> * forwarding */
683c686,687
< slot->inst->id.threadId == request->inst->id.threadId) {
---
> slot->inst->id.threadId == request->inst->id.threadId &&
> !slot->packet->req->isCacheMaintenance()) {
1495c1499
< if (flags & Request::CACHE_BLOCK_ZERO) {
---
> if (flags & Request::STORE_NO_DATA) {
1565c1569
< if (isLoad)
---
> if (isLoad) {
1567c1571,1573
< else
---
> } else if (!request.isCacheMaintenance()) {
> // CMOs are treated as stores but they don't have data. All
> // stores otherwise need to allocate for data.
1568a1575
> }