2c2
< * Copyright (c) 2012 ARM Limited
---
> * Copyright (c) 2012-2013 ARM Limited
413d412
< assert(clock);
415c414
< uint64_t ticksPerCount = clock *
---
> uint64_t ticksPerCount = clockPeriod() *
590d588
< assert(clock);
596c594
< Tick offset = curTick() % clock;
---
> Tick offset = curTick() % clockPeriod();
599c597,598
< curTick() + (newCount + 1) * clock - offset, true);
---
> curTick() + (newCount + 1) *
> clockPeriod() - offset, true);
602c601,602
< curTick() + newCount * clock, true);
---
> curTick() + newCount *
> clockPeriod(), true);
632,633d631
< // Override the default clock
< clock = 0;
738d735
< SERIALIZE_SCALAR(clock);
764d760
< UNSERIALIZE_SCALAR(clock);