--- a/hotspot/src/cpu/s390/vm/frame_s390.cpp	Thu Nov 10 23:26:56 2016 -0800
+++ b/hotspot/src/cpu/s390/vm/frame_s390.cpp	Mon Nov 07 12:37:28 2016 +0100
@@ -156,7 +156,7 @@
   }
   own_abi()->return_pc = (uint64_t)pc;
   _cb = CodeCache::find_blob(pc);
-  address original_pc = nmethod::get_deopt_original_pc(this);
+  address original_pc = CompiledMethod::get_deopt_original_pc(this);
   if (original_pc != NULL) {
     assert(original_pc == _pc, "expected original to be stored before patching");
     _deopt_state = is_deoptimized;