--- a/src/hotspot/cpu/s390/assembler_s390.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/assembler_s390.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2017 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_ASSEMBLER_S390_INLINE_HPP
-#define CPU_S390_VM_ASSEMBLER_S390_INLINE_HPP
+#ifndef CPU_S390_ASSEMBLER_S390_INLINE_HPP
+#define CPU_S390_ASSEMBLER_S390_INLINE_HPP
 
 #include "asm/assembler.inline.hpp"
 #include "asm/codeBuffer.hpp"
@@ -1460,4 +1460,4 @@
   return (is_equal(pc, CGIT_ZOPC, RIE_MASK) || is_equal(pc, CIT_ZOPC, RIE_MASK));
 }
 
-#endif // CPU_S390_VM_ASSEMBLER_S390_INLINE_HPP
+#endif // CPU_S390_ASSEMBLER_S390_INLINE_HPP