2c2
< * Copyright (c) 2013 ARM Limited
---
> * Copyright (c) 2013,2016 ARM Limited
58c58,59
< : ClockedObject(p), blkSize(p->block_size), size(p->size),
---
> : ClockedObject(p), blkSize(p->block_size), blkMask(blkSize - 1),
> size(p->size),