diff --git a/src/hotspot/cpu/s390/c1_Runtime1_s390.cpp b/src/hotspot/cpu/s390/c1_Runtime1_s390.cpp
index 05071d4a7c0..9575afe47df 100644
--- a/src/hotspot/cpu/s390/c1_Runtime1_s390.cpp
+++ b/src/hotspot/cpu/s390/c1_Runtime1_s390.cpp
@@ -241,7 +241,7 @@ uint Runtime1::runtime_blob_current_thread_offset(frame f) {
                                (float_reg_slots * 8) +
                                (int_regs_before_r8 * 8);
 
-  return z_thread_offset / 8;  // Convert to 64-bit words
+  return z_thread_offset / wordSize;
 }
 
 OopMapSet* Runtime1::generate_exception_throw(StubAssembler* sasm, address target, bool has_argument) {
diff --git a/src/hotspot/cpu/s390/frame_s390.hpp b/src/hotspot/cpu/s390/frame_s390.hpp
index 6763ad78613..a27410142dd 100644
--- a/src/hotspot/cpu/s390/frame_s390.hpp
+++ b/src/hotspot/cpu/s390/frame_s390.hpp
@@ -574,6 +574,7 @@
     metadata_words           = sizeof(z_java_abi) >> LogBytesPerWord,
     metadata_words_at_bottom = 0,
     metadata_words_at_top    = sizeof(z_java_abi) >> LogBytesPerWord,
+    // in bytes
     frame_alignment          = 8,
     // size, in words, of maximum shift in frame position due to alignment
     align_wiggle             =  0