2c2
< * Copyright (c) 2010, 2012-2017 ARM Limited
---
> * Copyright (c) 2010, 2012-2018 ARM Limited
632c632
< SERIALIZE_ARRAY(miscRegs, NumMiscRegs);
---
> SERIALIZE_ARRAY(miscRegs, NUM_PHYS_MISCREGS);
644c644
< UNSERIALIZE_ARRAY(miscRegs, NumMiscRegs);
---
> UNSERIALIZE_ARRAY(miscRegs, NUM_PHYS_MISCREGS);