Fix timestamp counter on s390/s390x

Fixes #811
Merge pull request #818 from Debian/s390x

Fix timestamp counter on s390/s390x