--- a/src/hotspot/cpu/s390/assembler_s390.inline.hpp	Tue May 21 11:45:37 2019 +0200
+++ b/src/hotspot/cpu/s390/assembler_s390.inline.hpp	Tue May 21 15:51:35 2019 +0200
@@ -1344,7 +1344,7 @@
 
 // Instruction must start at passed address.
 // Extra check for illtraps with ID.
-inline int Assembler::instr_len(unsigned char *instr) {
+inline unsigned int Assembler::instr_len(unsigned char *instr) {
   switch ((*instr) >> 6) {
     case 0: return 2;
     case 1: // fallthru