s390: convert to generic entry