Squashed a bug in paging code from the ARMv8 branch.