--- old/src/share/vm/memory/gcLocker.inline.hpp	2015-05-12 11:41:45.907985984 +0200
+++ /dev/null	2015-03-18 17:10:38.111854831 +0100
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_VM_MEMORY_GCLOCKER_INLINE_HPP
-#define SHARE_VM_MEMORY_GCLOCKER_INLINE_HPP
-
-#include "memory/gcLocker.hpp"
-
-inline void GC_locker::lock_critical(JavaThread* thread) {
-  if (!thread->in_critical()) {
-    if (needs_gc()) {
-      // jni_lock call calls enter_critical under the lock so that the
-      // global lock count and per thread count are in agreement.
-      jni_lock(thread);
-      return;
-    }
-    increment_debug_jni_lock_count();
-  }
-  thread->enter_critical();
-}
-
-inline void GC_locker::unlock_critical(JavaThread* thread) {
-  if (thread->in_last_critical()) {
-    if (needs_gc()) {
-      // jni_unlock call calls exit_critical under the lock so that
-      // the global lock count and per thread count are in agreement.
-      jni_unlock(thread);
-      return;
-    }
-    decrement_debug_jni_lock_count();
-  }
-  thread->exit_critical();
-}
-
-#endif // SHARE_VM_MEMORY_GCLOCKER_INLINE_HPP
--- /dev/null	2015-03-18 17:10:38.111854831 +0100
+++ new/src/share/vm/gc/shared/gcLocker.inline.hpp	2015-05-12 11:41:45.634974613 +0200
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_VM_GC_SHARED_GCLOCKER_INLINE_HPP
+#define SHARE_VM_GC_SHARED_GCLOCKER_INLINE_HPP
+
+#include "gc/shared/gcLocker.hpp"
+
+inline void GC_locker::lock_critical(JavaThread* thread) {
+  if (!thread->in_critical()) {
+    if (needs_gc()) {
+      // jni_lock call calls enter_critical under the lock so that the
+      // global lock count and per thread count are in agreement.
+      jni_lock(thread);
+      return;
+    }
+    increment_debug_jni_lock_count();
+  }
+  thread->enter_critical();
+}
+
+inline void GC_locker::unlock_critical(JavaThread* thread) {
+  if (thread->in_last_critical()) {
+    if (needs_gc()) {
+      // jni_unlock call calls exit_critical under the lock so that
+      // the global lock count and per thread count are in agreement.
+      jni_unlock(thread);
+      return;
+    }
+    decrement_debug_jni_lock_count();
+  }
+  thread->exit_critical();
+}
+
+#endif // SHARE_VM_GC_SHARED_GCLOCKER_INLINE_HPP